DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove references to madwifi from various files

Browse source 
Number of documentation and configuration files had references to the
madwifi driver interface that was removed in the previous commit. Remove
these references as well.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-11-01 16:15:53 +02:00
parent f21495ad38
commit 01b32d5e36
9 changed files with 13 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/hostapd.fig
View file

@ -255,7 +255,7 @@ Single
4 0 0 50 -1 2 14 0.0000 4 195 720 1637 2371 hostapd\001 4 0 0 50 -1 2 14 0.0000 4 195 720 1637 2371 hostapd\001
4 0 0 50 -1 0 12 0.0000 4 180 600 3825 7125 prism54\001 4 0 0 50 -1 0 12 0.0000 4 180 600 3825 7125 prism54\001
4 0 0 50 -1 0 12 0.0000 4 180 510 1875 7125 hostap\001 4 0 0 50 -1 0 12 0.0000 4 180 510 1875 7125 hostap\001
4 0 0 50 -1 0 12 0.0000 4 135 600 2850 7125 madwifi\001 4 0 0 50 -1 0 12 0.0000 4 135 600 2850 7125 nl80211\001
4 0 0 50 -1 0 12 0.0000 4 135 270 4800 7125 bsd\001 4 0 0 50 -1 0 12 0.0000 4 135 270 4800 7125 bsd\001
4 0 0 50 -1 0 12 0.0000 4 105 300 6750 7125 test\001 4 0 0 50 -1 0 12 0.0000 4 105 300 6750 7125 test\001
4 0 0 50 -1 0 12 0.0000 4 135 420 5775 7125 wired\001 4 0 0 50 -1 0 12 0.0000 4 135 420 5775 7125 wired\001

2
doc/wpa_supplicant.fig
View file

@ -100,7 +100,7 @@ Single
2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
4650 6600 4650 6300 4650 6600 4650 6300
4 0 0 50 -1 0 12 0.0000 4 180 510 2850 7125 hostap\001 4 0 0 50 -1 0 12 0.0000 4 180 510 2850 7125 hostap\001
4 0 0 50 -1 0 12 0.0000 4 135 600 3825 7125 madwifi\001 4 0 0 50 -1 0 12 0.0000 4 135 600 3825 7125 nl80211\001
-6 -6
6 3525 7800 5775 8100 6 3525 7800 5775 8100
2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5

6
hostapd/README
View file

@ -74,12 +74,6 @@ Current hardware/software requirements:
Please note that station firmware version needs to be 1.7.0 or newer Please note that station firmware version needs to be 1.7.0 or newer
to work in WPA mode. to work in WPA mode.
madwifi driver for cards based on Atheros chip set (ar521x)
(http://sourceforge.net/projects/madwifi/)
Please note that you will need to add the correct path for
madwifi driver root directory in .config (see defconfig file for
an example: CFLAGS += -I<path>)
mac80211-based drivers that support AP mode (with driver=nl80211). mac80211-based drivers that support AP mode (with driver=nl80211).
This includes drivers for Atheros (ath9k) and Broadcom (b43) This includes drivers for Atheros (ath9k) and Broadcom (b43)
chipsets. chipsets.

9
hostapd/README-WPS
View file

@ -58,10 +58,9 @@ hostapd configuration
WPS is an optional component that needs to be enabled in hostapd build WPS is an optional component that needs to be enabled in hostapd build
configuration (.config). Here is an example configuration that configuration (.config). Here is an example configuration that
includes WPS support and uses madwifi driver interface: includes WPS support and uses nl80211 driver interface:
CONFIG_DRIVER_MADWIFI=y CONFIG_DRIVER_NL80211=y
CFLAGS += -I/usr/src/madwifi-0.9.3
CONFIG_WPS=y CONFIG_WPS=y
CONFIG_WPS_UPNP=y CONFIG_WPS_UPNP=y
@ -74,8 +73,8 @@ Following section shows an example runtime configuration
(hostapd.conf) that enables WPS: (hostapd.conf) that enables WPS:
# Configure the driver and network interface # Configure the driver and network interface
driver=madwifi driver=nl80211
interface=ath0 interface=wlan0
# WPA2-Personal configuration for the AP # WPA2-Personal configuration for the AP
ssid=wps-test ssid=wps-test

6
hostapd/android.config
View file

@ -15,10 +15,6 @@
# Driver interface for wired authenticator # Driver interface for wired authenticator
#CONFIG_DRIVER_WIRED=y #CONFIG_DRIVER_WIRED=y
# Driver interface for madwifi driver
#CONFIG_DRIVER_MADWIFI=y
#CFLAGS += -I../../madwifi # change to the madwifi source directory
# Driver interface for drivers using the nl80211 kernel interface # Driver interface for drivers using the nl80211 kernel interface
#CONFIG_DRIVER_NL80211=y #CONFIG_DRIVER_NL80211=y
# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be # driver_nl80211.c requires a rather new libnl (version 1.1) which may not be
@ -132,7 +128,7 @@ CONFIG_IPV6=y
#CONFIG_IEEE80211R=y #CONFIG_IEEE80211R=y
# Use the hostapd's IEEE 802.11 authentication (ACL), but without # Use the hostapd's IEEE 802.11 authentication (ACL), but without
# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) # the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
#CONFIG_DRIVER_RADIUS_ACL=y #CONFIG_DRIVER_RADIUS_ACL=y
# IEEE 802.11n (High Throughput) support # IEEE 802.11n (High Throughput) support

6
hostapd/defconfig
View file

@ -15,10 +15,6 @@ CONFIG_DRIVER_HOSTAP=y
# Driver interface for wired authenticator # Driver interface for wired authenticator
#CONFIG_DRIVER_WIRED=y #CONFIG_DRIVER_WIRED=y
# Driver interface for madwifi driver
#CONFIG_DRIVER_MADWIFI=y
#CFLAGS += -I../../madwifi # change to the madwifi source directory
# Driver interface for drivers using the nl80211 kernel interface # Driver interface for drivers using the nl80211 kernel interface
CONFIG_DRIVER_NL80211=y CONFIG_DRIVER_NL80211=y
@ -142,7 +138,7 @@ CONFIG_IPV6=y
#CONFIG_IEEE80211R=y #CONFIG_IEEE80211R=y
# Use the hostapd's IEEE 802.11 authentication (ACL), but without # Use the hostapd's IEEE 802.11 authentication (ACL), but without
# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) # the IEEE 802.11 Management capability (e.g., FreeBSD/net80211)
#CONFIG_DRIVER_RADIUS_ACL=y #CONFIG_DRIVER_RADIUS_ACL=y
# IEEE 802.11n (High Throughput) support # IEEE 802.11n (High Throughput) support

2
hostapd/hostapd.8
View file

@ -12,7 +12,7 @@ daemon.
.B hostapd .B hostapd
is a user space daemon for access point and authentication servers. is a user space daemon for access point and authentication servers.
It implements IEEE 802.11 access point management, IEEE 802.1X/WPA/WPA2/EAP Authenticators and RADIUS authentication server. It implements IEEE 802.11 access point management, IEEE 802.1X/WPA/WPA2/EAP Authenticators and RADIUS authentication server.
The current version supports Linux (Host AP, madwifi, mac80211-based drivers) and FreeBSD (net80211). The current version supports Linux (Host AP, mac80211-based drivers) and FreeBSD (net80211).
.B hostapd .B hostapd
is designed to be a "daemon" program that runs in the background and acts as the backend component controlling authentication. is designed to be a "daemon" program that runs in the background and acts as the backend component controlling authentication.

8
hostapd/hostapd.conf
View file

@ -2,10 +2,10 @@
# Empty lines and lines starting with # are ignored # Empty lines and lines starting with # are ignored
# AP netdevice name (without 'ap' postfix, i.e., wlan0 uses wlan0ap for # AP netdevice name (without 'ap' postfix, i.e., wlan0 uses wlan0ap for
# management frames); ath0 for madwifi # management frames with the Host AP driver); wlan0 with many nl80211 drivers
interface=wlan0 interface=wlan0
# In case of madwifi, atheros, and nl80211 driver interfaces, an additional # In case of atheros and nl80211 driver interfaces, an additional
# configuration parameter, bridge, may be used to notify hostapd if the # configuration parameter, bridge, may be used to notify hostapd if the
# interface is included in a bridge. This parameter is not used with Host AP # interface is included in a bridge. This parameter is not used with Host AP
# driver. If the bridge parameter is not set, the drivers will automatically # driver. If the bridge parameter is not set, the drivers will automatically
@ -18,7 +18,7 @@ interface=wlan0
# interface is also created. # interface is also created.
#bridge=br0 #bridge=br0
# Driver interface type (hostap/wired/madwifi/test/none/nl80211/bsd); # Driver interface type (hostap/wired/test/none/nl80211/bsd);
# default: hostap). nl80211 is used with all Linux mac80211 drivers. # default: hostap). nl80211 is used with all Linux mac80211 drivers.
# Use driver=none if building hostapd as a standalone RADIUS server that does # Use driver=none if building hostapd as a standalone RADIUS server that does
# not control any wireless/wired driver. # not control any wireless/wired driver.
@ -221,7 +221,7 @@ fragm_threshold=2346
# Station MAC address -based authentication # Station MAC address -based authentication
# Please note that this kind of access control requires a driver that uses # Please note that this kind of access control requires a driver that uses
# hostapd to take care of management frame processing and as such, this can be # hostapd to take care of management frame processing and as such, this can be
# used with driver=hostap or driver=nl80211, but not with driver=madwifi. # used with driver=hostap or driver=nl80211, but not with driver=atheros.
# 0 = accept unless in deny list # 0 = accept unless in deny list
# 1 = deny unless in accept list # 1 = deny unless in accept list
# 2 = use external RADIUS server (accept/deny lists are searched first) # 2 = use external RADIUS server (accept/deny lists are searched first)

1
wpa_supplicant/todo.txt
View file

@ -31,7 +31,6 @@ To do:
in one page; how to build a PDF file with all the SGML included? in one page; how to build a PDF file with all the SGML included?
- EAP-POTP/RSA SecurID profile (RFC 4793) - EAP-POTP/RSA SecurID profile (RFC 4793)
- document wpa_gui build and consider adding it to 'make install' - document wpa_gui build and consider adding it to 'make install'
- test madwifi with pairwise=TKIP group=WEP104
- consider merging hostapd and wpa_supplicant PMKSA cache implementations - consider merging hostapd and wpa_supplicant PMKSA cache implementations
- consider redesigning pending EAP requests (identity/password/otp from - consider redesigning pending EAP requests (identity/password/otp from
ctrl_iface) by moving the retrying of the previous request into EAP ctrl_iface) by moving the retrying of the previous request into EAP