Fix naming of IEEE 802 working groups

Use 'wpa' to refer to the 802.11i and 802.1x client side software
(wpa_supplicant) in general.

7 files changed, 12 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index b1bc626..b2ac7d8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ install: install-docs
 	install -m644 docs/examples/* $(DESTDIR)/etc/netctl/examples/
 	# Libs
 	install -d $(DESTDIR)/usr/lib/network/connections
-	install -m644 src/lib/{8021x,globals,ip,rfkill} $(DESTDIR)/usr/lib/network/
+	install -m644 src/lib/{globals,ip,rfkill,wpa} $(DESTDIR)/usr/lib/network/
 	install -m644 src/lib/connections/* $(DESTDIR)/usr/lib/network/connections/
 	install -m755 src/lib/{auto.action,network} $(DESTDIR)/usr/lib/network/
 	# Scripts
diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt
index 9841a82..e79c831 100644
--- a/docs/netctl.profile.5.txt
+++ b/docs/netctl.profile.5.txt
@@ -174,14 +174,14 @@ of the `ethernet' type:
     acceptable. Defaults to `++no++'.
 
 'Auth8021X='::
-    Set to `++yes++' to use 802.11x authentication.
+    Set to `++yes++' to use 802.1x authentication.
 
 'WPAConfigFile='::
     Path to a *wpa_supplicant* configuration file. Defaults to
     '/etc/wpa_supplicant.conf'.
 
 'WPADriver='::
-    The *wpa_supplicant* driver to use for 802.11x authentication.
+    The *wpa_supplicant* driver to use for 802.1x authentication.
     Defaults to `++wired++'.
 
 'TimeoutCarrier='::
@@ -189,7 +189,7 @@ of the `ethernet' type:
     `++5++'.
 
 'TimeoutWPA='::
-    Maximum time, in seconds, to wait for 802.11x authentication to
+    Maximum time, in seconds, to wait for 802.1x authentication to
     succeed. Defaults to `++15++'.
 
 
diff --git a/src/lib/connections/ethernet b/src/lib/connections/ethernet
index 6cc2c12..dfd0117 100644
--- a/src/lib/connections/ethernet
+++ b/src/lib/connections/ethernet
@@ -30,7 +30,7 @@ ethernet_up() {
 
 
     if is_yes "${Auth8021X:-no}"; then
-        . "$SUBR_DIR/8021x"
+        . "$SUBR_DIR/wpa"
         : ${WPAConfigFile:=/etc/wpa_supplicant.conf}
         : ${WPADriver:=wired}
         : ${TimeoutWPA:=15}
@@ -50,7 +50,7 @@ ethernet_up() {
     fi
 
     if ! ip_set; then
-        stop_80211x
+        stop_8021x
         bring_interface_down "$Interface"
         return 1
     fi
@@ -58,14 +58,14 @@ ethernet_up() {
 
 ethernet_down() {
     ip_unset
-    stop_80211x
+    stop_8021x
     bring_interface_down "$Interface"
 }
 
 # Stop wpa_supplicant if neccessary
-stop_80211x() {
+stop_8021x() {
     if is_yes "${Auth8021X:-no}"; then
-        . "$SUBR_DIR/8021x"
+        . "$SUBR_DIR/wpa"
         : ${WPAConfigFile:=/etc/wpa_supplicant.conf}
         do_debug wpa_stop "$Interface"
     fi
diff --git a/src/lib/connections/wireless b/src/lib/connections/wireless
index 6444c4c..fe01b90 100644
--- a/src/lib/connections/wireless
+++ b/src/lib/connections/wireless
@@ -1,7 +1,7 @@
 # Wireless connection support for netctl
 
-. "$SUBR_DIR/8021x"
 . "$SUBR_DIR/ip"
+. "$SUBR_DIR/wpa"
 . "$SUBR_DIR/rfkill"
 
 
diff --git a/src/lib/8021x b/src/lib/wpa
index 65ef8f9..65ef8f9 100644
--- a/src/lib/8021x
+++ b/src/lib/wpa
diff --git a/src/netctl-auto b/src/netctl-auto
index 7590110..ea692ca 100755
--- a/src/netctl-auto
+++ b/src/netctl-auto
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 . /usr/lib/network/globals
-. "$SUBR_DIR/8021x"
+. "$SUBR_DIR/wpa"
 . "$SUBR_DIR/rfkill"
 
 : ${ACTIOND:=wpa_actiond -p /run/wpa_supplicant}
diff --git a/src/wifi-menu b/src/wifi-menu
index 2716d68..188f6c7 100755
--- a/src/wifi-menu
+++ b/src/wifi-menu
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 . /usr/lib/network/globals
-. "$SUBR_DIR/8021x"
+. "$SUBR_DIR/wpa"
 
 
 usage()