You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
2.3 KiB
50 lines
2.3 KiB
7 years ago
|
From ba5ea116873a2f4046e4d3f37ab8215a3846f614 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <ba5ea116873a2f4046e4d3f37ab8215a3846f614.1488376602.git.dcaratti@redhat.com>
|
||
|
|
From: Sabrina Dubroca <sd@queasysnail.net>
|
||
|
|
Date: Sun, 27 Nov 2016 20:08:56 +0100
|
||
|
|
Subject: [PATCH] mka: Remove references to macsec_qca from wpa_supplicant.conf
|
||
|
|
|
||
|
|
Make the documentation generic, as this is no longer the only macsec
|
||
|
|
driver.
|
||
|
|
|
||
|
|
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
|
||
|
|
---
|
||
|
|
wpa_supplicant/wpa_supplicant.conf | 10 ++++------
|
||
|
|
1 file changed, 4 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf
|
||
|
|
index 82aa24e..edb230d 100644
|
||
|
|
--- a/wpa_supplicant/wpa_supplicant.conf
|
||
|
|
+++ b/wpa_supplicant/wpa_supplicant.conf
|
||
|
|
@@ -98,9 +98,7 @@ eapol_version=1
|
||
|
|
# parameters (e.g., WPA IE generation); this mode can also be used with
|
||
|
|
# non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
|
||
|
|
# APs (i.e., external program needs to control association). This mode must
|
||
|
|
-# also be used when using wired Ethernet drivers.
|
||
|
|
-# Note: macsec_qca driver is one type of Ethernet driver which implements
|
||
|
|
-# macsec feature.
|
||
|
|
+# also be used when using wired Ethernet drivers (including MACsec).
|
||
|
|
# 2: like 0, but associate with APs using security policy and SSID (but not
|
||
|
|
# BSSID); this can be used, e.g., with ndiswrapper and NDIS drivers to
|
||
|
|
# enable operation with hidden SSIDs and optimized roaming; in this mode,
|
||
|
|
@@ -881,13 +879,13 @@ fast_reauth=1
|
||
|
|
# bit0 (1): require dynamically generated unicast WEP key
|
||
|
|
# bit1 (2): require dynamically generated broadcast WEP key
|
||
|
|
# (3 = require both keys; default)
|
||
|
|
-# Note: When using wired authentication (including macsec_qca driver),
|
||
|
|
+# Note: When using wired authentication (including MACsec drivers),
|
||
|
|
# eapol_flags must be set to 0 for the authentication to be completed
|
||
|
|
# successfully.
|
||
|
|
#
|
||
|
|
# macsec_policy: IEEE 802.1X/MACsec options
|
||
|
|
-# This determines how sessions are secured with MACsec. It is currently
|
||
|
|
-# applicable only when using the macsec_qca driver interface.
|
||
|
|
+# This determines how sessions are secured with MACsec (only for MACsec
|
||
|
|
+# drivers).
|
||
|
|
# 0: MACsec not in use (default)
|
||
|
|
# 1: MACsec enabled - Should secure, accept key server's advice to
|
||
|
|
# determine whether to use a secure session or not.
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|