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