mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
wpa-supplicant: add patch to check for kernel header version when compiling macsec
When using Arm binary toolchain, version 2.11 of wpa-supplicant is failing to compile with the following error: | ../src/drivers/driver_macsec_linux.c:81:29: error: field ‘offload’ has incomplete type | 81 | enum macsec_offload offload; | | Backport a recent patch that corrects the issue by adding a check for the version of kernel headers being used in compilation and disabling that enum if too old a version is being used (or is used by the binary toolchain). (From OE-Core rev: 373d8d4f5316416d70eb2c0733d9838e57419ac3) Signed-off-by: Jon Mason <jdmason@kudzu.us> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
5f2557e8ed
commit
d141a3f1ef
@@ -0,0 +1,53 @@
|
||||
From 809d9d8172db8e2a08ff639875f838b5b86d2641 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Matyukevich <geomatsi@gmail.com>
|
||||
Date: Thu, 22 Aug 2024 00:03:41 +0300
|
||||
Subject: [PATCH] macsec_linux: Hardware offload requires Linux headers >= v5.7
|
||||
|
||||
Hardware offload in Linux macsec driver is enabled in compile time if
|
||||
libnl version is >= v3.6. This is not sufficient for successful build
|
||||
since enum 'macsec_offload' has been added to Linux header if_link.h
|
||||
in kernels v5.6 and v5.7, see commits:
|
||||
- https://github.com/torvalds/linux/commit/21114b7feec29e4425a3ac48a037569c016a46c8
|
||||
- https://github.com/torvalds/linux/commit/76564261a7db80c5f5c624e0122a28787f266bdf
|
||||
|
||||
New libnl with older Linux headers is a valid combination. This is how
|
||||
hostapd build failure has been detected by Buildroot autobuilder, see:
|
||||
- http://autobuild.buildroot.net/results/b59d5bc5bd17683a3a1e3577c40c802e81911f84/
|
||||
|
||||
Extend compile time condition for the enablement of the macsec hardware
|
||||
offload adding Linux headers version check.
|
||||
|
||||
Fixes: 40c139664439 ("macsec_linux: Add support for MACsec hardware offload")
|
||||
Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
|
||||
|
||||
Upstream-Status: Backport [https://w1.fi/cgit/hostap/patch/?id=809d9d8172db8e2a08ff639875f838b5b86d2641]
|
||||
Signed-off-by: Jon Mason <jdmason@kudzu.us>
|
||||
---
|
||||
src/drivers/driver_macsec_linux.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/drivers/driver_macsec_linux.c b/src/drivers/driver_macsec_linux.c
|
||||
index c867154981e9..fad47a292f9f 100644
|
||||
--- a/src/drivers/driver_macsec_linux.c
|
||||
+++ b/src/drivers/driver_macsec_linux.c
|
||||
@@ -19,6 +19,7 @@
|
||||
#include <netlink/route/link.h>
|
||||
#include <netlink/route/link/macsec.h>
|
||||
#include <linux/if_macsec.h>
|
||||
+#include <linux/version.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include "utils/common.h"
|
||||
@@ -32,7 +33,8 @@
|
||||
|
||||
#define UNUSED_SCI 0xffffffffffffffff
|
||||
|
||||
-#if LIBNL_VER_NUM >= LIBNL_VER(3, 6)
|
||||
+#if (LIBNL_VER_NUM >= LIBNL_VER(3, 6) && \
|
||||
+ LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0))
|
||||
#define LIBNL_HAS_OFFLOAD
|
||||
#endif
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@@ -15,6 +15,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \
|
||||
file://wpa_supplicant.conf \
|
||||
file://wpa_supplicant.conf-sane \
|
||||
file://99_wpa_supplicant \
|
||||
file://0001-macsec_linux-Hardware-offload-requires-Linux-headers.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user