Remove long lingering references to wlan_auth and wlan_radius.

Ticket: #467

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3067 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/README b/README
index 11fc1b949034361894b2bd4c248f3c2634924802..6fc9a86ef75b7fe4b270df37b58222b4fa783943 100644 (file)
--- a/README
+++ b/README
@@ -44,9 +44,9 @@ support needed by any 802.11 device.  This code is derived from work
 that first appeared in NetBSD and then FreeBSD.  The wlan module may
 also force the loading of additional modules for crypto support
 (wlan_wep, wlan_tkip, wlan_ccmp, etc.), for MAC-based ACL support
-(wlan_acl), and for 802.1x authenticator support (wlan_auth,
-wlan_radius).  The latter modules are only used when operating as an AP. 
-The crypto modules are loaded when keys of that type are created.
+(wlan_acl), and for 802.1x authenticator support (wlan_xauth).  The 
+latter modules are only used when operating as an AP.  The crypto 
+modules are loaded when keys of that type are created.
 
 The ath_hal module contains the Atheros Hardware Access Layer (HAL).
 This code manages much of the chip-specific operation of the driver. 

diff --git a/contrib/madwifi.spec.in b/contrib/madwifi.spec.in
index e58721ba87e35cc57a74b2abad01815abab85cfa..95868c1c8841a4e65f9469ce8f588da27559aec6 100644 (file)
--- a/contrib/madwifi.spec.in
+++ b/contrib/madwifi.spec.in
@@ -72,9 +72,9 @@ This code is derived from work that first appeared in NetBSD and
 then FreeBSD.  The wlan module may also force the loading of
 additional modules for crypto support (wlan_wep, wlan_tkip, wlan_ccmp,
 etc.), for MAC-based ACL support (wlan_acl), and for 802.1x
-authenticator support (wlan_auth, wlan_radius)).  The latter modules
-are only used when operating as an AP.  The crypto modules are
-loaded when keys of that type are created.
+authenticator support (wlan_xauth).  The latter modules are only 
+used when operating as an AP.  The crypto modules are loaded when 
+keys of that type are created.
 
 %prep 
 #%setup -q 

diff --git a/net80211/Makefile b/net80211/Makefile
index 0040c696eb1bcdb965c48669f26bf5e13039e85e..bdbdf9969440df0f824426d69ad2ebbc19c79f99 100644 (file)
--- a/net80211/Makefile
+++ b/net80211/Makefile
@@ -45,14 +45,9 @@ endif
 
 TOP = $(obj)/..
 #
-# There are two authenticator mechanisms: an in-kernel implementation
-# (wlan_auth+wlan_radius) and an external implementation (wlan_xauth) that
-# requires a user process to manage the authentication process.  By default
-# the external authenticator is used.  ieee80211_proto.c has a table of module
-# names that defines the default module to auto-load for each authentication
-# scheme; to get the in-kernel authenticator by default modify it to load
-# wlan_auth instead of wlan_xauth or manually load wlan_auth prior to use.
-# 
+# There is one authenticator mechanism: an in-kernel implementation
+# (wlan_xauth). 
+#
 MOD_AUTH       := wlan_xauth.o
 #
 # Scanning policy is split into modules.  The default policy modules

diff --git a/net80211/Makefile.kernel b/net80211/Makefile.kernel
index 88160baff5e44f657442f99664518bac84071454..b19a158220af12af2e3ab144dae0b1ab21e02767 100644 (file)
--- a/net80211/Makefile.kernel
+++ b/net80211/Makefile.kernel
@@ -20,13 +20,8 @@ INCS += -I$(TOP) -I$(ATH_HAL) -I$(HAL)
 EXTRA_CFLAGS += $(INCS) $(COPTS) -DOPT_AH_H=\"public/$(TARGET).opt_ah.h\"
 
 #
-# There are two authenticator mechanisms: an in-kernel implementation
-# (wlan_auth+wlan_radius) and an external implementation (wlan_xauth) that
-# requires a user process to manage the authentication process.  By default
-# the external authenticator is used.  ieee80211_proto.c has a table of module
-# names that defines the default module to auto-load for each authentication
-# scheme; to get the in-kernel authenticator by default modify it to load
-# wlan_auth instead of wlan_xauth or manually load wlan_auth prior to use.
+# There is one authenticator mechanism: an in-kernel implementation
+# (wlan_xauth). 
 #
 MOD_AUTH       := wlan_xauth.o
 #

diff --git a/net80211/ieee80211_proto.c b/net80211/ieee80211_proto.c
index 106166e57d26f24060b52ee053f29ac9b364dd8f..0cfef94d7b0f70cc18120f2b7be65eeeb5577dc2 100644 (file)
--- a/net80211/ieee80211_proto.c
+++ b/net80211/ieee80211_proto.c
@@ -248,8 +248,6 @@ EXPORT_SYMBOL(ieee80211_authenticator_backend_unregister);
 const struct ieee80211_authenticator_backend *
 ieee80211_authenticator_backend_get(const char *name)
 {
-       if (backend == NULL)
-               ieee80211_load_module("wlan_radius");
        return backend && strcmp(backend->iab_name, name) == 0 ? backend : NULL;
 }
 EXPORT_SYMBOL(ieee80211_authenticator_backend_get);