From: Johannes Berg <johannes.berg@xxxxxxxxx>
Add CONFIG_DRIVER_MACSEC_LINUX and CONFIG_MACSEC to the default
configuration for the build.sh script, this is safe because the
tests still check the kernel's capabilities.
While at it, correct the name of CONFIG_DRIVER_MACSEC_LINUX in
the tests' HwsimSkip().
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
---
tests/hwsim/example-wpa_supplicant.config | 3 +++
tests/hwsim/test_macsec.py | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/hwsim/example-wpa_supplicant.config b/tests/hwsim/example-wpa_supplicant.config
index b681e9f555c3..bbd1dbe310ed 100644
--- a/tests/hwsim/example-wpa_supplicant.config
+++ b/tests/hwsim/example-wpa_supplicant.config
@@ -154,3 +154,6 @@ CONFIG_FILS_SK_PFS=y
CONFIG_PMKSA_CACHE_EXTERNAL=y
CONFIG_OWE=y
CONFIG_DPP=y
+
+CONFIG_MACSEC=y
+CONFIG_DRIVER_MACSEC_LINUX=y
diff --git a/tests/hwsim/test_macsec.py b/tests/hwsim/test_macsec.py
index 871e465ac224..956c57a60d48 100644
--- a/tests/hwsim/test_macsec.py
+++ b/tests/hwsim/test_macsec.py
@@ -166,7 +166,7 @@ def add_wpas_interfaces(count=2):
wpa.append(wpas)
except Exception as e:
if "Failed to add a dynamic wpa_supplicant interface" in str(e):
- raise HwsimSkip("macsec supported (wpa_supplicant CONFIG_MACSEC, CONFIG_MACSEC_LINUX; kernel CONFIG_MACSEC)")
+ raise HwsimSkip("macsec supported (wpa_supplicant CONFIG_MACSEC, CONFIG_DRIVER_MACSEC_LINUX; kernel CONFIG_MACSEC)")
raise
return wpa
@@ -574,7 +574,7 @@ def run_macsec_psk_ns(dev, apdev, params):
try:
subprocess.check_call(arg)
except subprocess.CalledProcessError:
- raise HwsimSkip("macsec supported (wpa_supplicant CONFIG_MACSEC, CONFIG_MACSEC_LINUX; kernel CONFIG_MACSEC)")
+ raise HwsimSkip("macsec supported (wpa_supplicant CONFIG_MACSEC, CONFIG_DRIVER_MACSEC_LINUX; kernel CONFIG_MACSEC)")
if os.path.exists("wpa_supplicant-macsec2"):
logger.info("Use alternative wpa_supplicant binary for one of the macsec devices")
--
2.17.2
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
