From b94f97a79049a674e1b19fec5130eeaf8bfdd954 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 3 Aug 2012 19:22:05 +0200 Subject: [PATCH] madwifi: removed. --- config/hostapd/config | 4 +- config/hostapd/hostapd.conf | 2 +- config/madwifi/madwifi.conf | 295 --------------------------- config/rootfiles/common/i586/madwifi | 22 -- config/wpa_supplicant/config | 4 +- lfs/madwifi | 93 --------- make.sh | 5 - 7 files changed, 5 insertions(+), 420 deletions(-) delete mode 100644 config/madwifi/madwifi.conf delete mode 100644 config/rootfiles/common/i586/madwifi delete mode 100644 lfs/madwifi diff --git a/config/hostapd/config b/config/hostapd/config index 88dca15c64..6158e2cdf0 100644 --- a/config/hostapd/config +++ b/config/hostapd/config @@ -16,8 +16,8 @@ CONFIG_DRIVER_HOSTAP=y #CONFIG_DRIVER_WIRED=y # Driver interface for madwifi driver -CONFIG_DRIVER_MADWIFI=y -CFLAGS += -I../../madwifi # change to the madwifi source directory +#CONFIG_DRIVER_MADWIFI=y +#CFLAGS += -I../../madwifi # change to the madwifi source directory # Driver interface for Prism54 driver CONFIG_DRIVER_PRISM54=y diff --git a/config/hostapd/hostapd.conf b/config/hostapd/hostapd.conf index 5e67dcee4a..e1f493f96e 100644 --- a/config/hostapd/hostapd.conf +++ b/config/hostapd/hostapd.conf @@ -1,4 +1,4 @@ -driver=madwifi +driver=nl80211 ######################### basic hostapd configuration ########################## # interface=blue0 diff --git a/config/madwifi/madwifi.conf b/config/madwifi/madwifi.conf deleted file mode 100644 index a4a234f379..0000000000 --- a/config/madwifi/madwifi.conf +++ /dev/null @@ -1,295 +0,0 @@ -##### hostapd configuration file ############################################## -# Empty lines and lines starting with # are ignored - -# AP netdevice name (without 'ap' prefix, i.e., wlan0 uses wlan0ap for -# management frames) -interface=ath0 - -# Driver interface type (hostap/wired/madwifi/prism54; default: hostap) -driver=madwifi - -# hostapd event logger configuration -# -# Two output method: syslog and stdout (only usable if not forking to -# background). -# -# Module bitfield (ORed bitfield of modules that will be logged; -1 = all -# modules): -# bit 0 (1) = IEEE 802.11 -# bit 1 (2) = IEEE 802.1X -# bit 2 (4) = RADIUS -# bit 3 (8) = WPA -# bit 4 (16) = driver interface -# bit 5 (32) = IAPP -# -# Levels (minimum value for logged events): -# 0 = verbose debugging -# 1 = debugging -# 2 = informational messages -# 3 = notification -# 4 = warning -# -logger_syslog=-1 -logger_syslog_level=2 -logger_stdout=-1 -logger_stdout_level=1 - -# Debugging: 0 = no, 1 = minimal, 2 = verbose, 3 = msg dumps, 4 = excessive -debug=0 - -# Dump file for state information (on SIGUSR1) -dump_file=/tmp/hostapd.dump - -# Interface for separate control program. If this is specified, hostapd -# will create this directory and a UNIX domain socket for listening to requests -# from external programs (CLI/GUI, etc.) for status information and -# configuration. The socket file will be named based on the interface name, so -# multiple hostapd processes/interfaces can be run at the same time if more -# than one interface is used. -# /var/run/hostapd is the recommended directory for sockets and by default, -# hostapd_cli will use it when trying to connect with hostapd. -ctrl_interface=/var/run/hostapd - -# Access control for the control interface can be configured by setting the -# directory to allow only members of a group to use sockets. This way, it is -# possible to run hostapd as root (since it needs to change network -# configuration and open raw sockets) and still allow GUI/CLI components to be -# run as non-root users. However, since the control interface can be used to -# change the network configuration, this access needs to be protected in many -# cases. By default, hostapd is configured to use gid 0 (root). If you -# want to allow non-root users to use the contron interface, add a new group -# and change this value to match with that group. Add users that should have -# control interface access to this group. -# -# This variable can be a group name or gid. -#ctrl_interface_group=wheel -ctrl_interface_group=0 - - -##### IEEE 802.11 related configuration ####################################### - -# SSID to be used in IEEE 802.11 management frames -ssid=IPFire - -# Station MAC address -based authentication -# 0 = accept unless in deny list -# 1 = deny unless in accept list -# 2 = use external RADIUS server (accept/deny lists are searched first) -macaddr_acl=0 - -# Accept/deny lists are read from separate files (containing list of -# MAC addresses, one per line). Use absolute path name to make sure that the - -# files can be read on SIGHUP configuration reloads. -#accept_mac_file=/etc/hostapd/hostapd.accept -#deny_mac_file=/etc/hostapd/hostapd.deny - -# IEEE 802.11 specifies two authentication algorithms. hostapd can be -# configured to allow both of these or only one. Open system authentication -# should be used with IEEE 802.1X. -# Bit fields of allowed authentication algorithms: -# bit 0 = Open System Authentication -# bit 1 = Shared Key Authentication (requires WEP) -auth_algs=1 - -# Associate as a station to another AP while still acting as an AP on the same -# channel. -#assoc_ap_addr=00:12:34:56:78:9a - - -##### IEEE 802.1X (and IEEE 802.1aa/D4) related configuration ################# - -# Require IEEE 802.1X authorization -#ieee8021x=0 - -# Use integrated EAP authenticator instead of external RADIUS authentication -# server -#eap_authenticator=0 - -# Path for EAP authenticator user database -#eap_user_file=/etc/hostapd/eap_user - -# CA certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS -#ca_cert=/etc/hostapd/ca.pem - -# Server certificate (PEM or DER file) for EAP-TLS/PEAP/TTLS -#server_cert=/etc/hostapd/server.pem - -# Private key matching with the server certificate for EAP-TLS/PEAP/TTLS -# This may point to the same file as server_cert if both certificate and key -# are included in a single file. PKCS#12 (PFX) file (.p12/.pfx) can also be -# used by commenting out server_cert and specifying the PFX file as the -# private_key. -#private_key=/etc/hostapd/server.prv - -# Passphrase for private key -#private_key_passwd=secret passphrase - -# Configuration data for EAP-SIM database/authentication gateway interface. -# This is a text string in implementation specific format. The example -# implementation in eap_sim_db.c uses this as the file name for the GSM -# authentication triplets. -#eap_sim_db=/etc/hostapd/sim_db - -# Optional displayable message sent with EAP Request-Identity -#eap_message=hello - -# WEP rekeying (disabled if key lengths are not set or are set to 0) -# Key lengths for default/broadcast and individual/unicast keys: -# 5 = 40-bit WEP (also known as 64-bit WEP with 40 secret bits) -# 13 = 104-bit WEP (also known as 128-bit WEP with 104 secret bits) -#wep_key_len_broadcast=5 -#wep_key_len_unicast=5 -# Rekeying period in seconds. 0 = do not rekey (i.e., set keys only once) -#wep_rekey_period=300 - -# EAPOL-Key index workaround (set bit7) for WinXP Supplicant (needed only if -# only broadcast keys are used) -#eapol_key_index_workaround=0 - -# EAP reauthentication period in seconds (default: 3600 seconds; 0 = disable -# reauthentication). -#eap_reauth_period=3600 - - -##### IEEE 802.11f - Inter-Access Point Protocol (IAPP) ####################### - -# Interface to be used for IAPP broadcast packets -#iapp_interface=eth0 - - -##### RADIUS configuration #################################################### -# for IEEE 802.1X with external Authentication Server, IEEE 802.11 -# authentication with external ACL for MAC addresses, and accounting - -# The own IP address of the access point (used as NAS-IP-Address) -#own_ip_addr=127.0.0.1 - -# Optional NAS-Identifier string for RADIUS messages. When used, this should be -# a unique to the NAS within the scope of the RADIUS server. For example, a -# fully qualified domain name can be used here. -#nas_identifier=ap.example.com - -# RADIUS authentication server -#auth_server_addr=127.0.0.1 -#auth_server_port=1812 -#auth_server_shared_secret=secret - -# RADIUS accounting server -#acct_server_addr=127.0.0.1 -#acct_server_port=1813 -#acct_server_shared_secret=secret - -# Secondary RADIUS servers; to be used if primary one does not reply to -# RADIUS packets. These are optional and there can be more than one secondary -# server listed. -#auth_server_addr=127.0.0.2 -#auth_server_port=1812 -#auth_server_shared_secret=secret2 -# -#acct_server_addr=127.0.0.2 -#acct_server_port=1813 -#acct_server_shared_secret=secret2 - -# Retry interval for trying to return to the primary RADIUS server (in -# seconds). RADIUS client code will automatically try to use the next server -# when the current server is not replying to requests. If this interval is set, -# primary server will be retried after configured amount of time even if the -# currently used secondary server is still working. -#radius_retry_primary_interval=600 - -# Interim accounting update interval -# If this is set (larger than 0) and acct_server is configured, hostapd will -# send interim accounting updates every N seconds. Note: if set, this overrides -# possible Acct-Interim-Interval attribute in Access-Accept message. Thus, this -# value should not be configured in hostapd.conf, if RADIUS server is used to -# control the interim interval. -# This value should not be less 600 (10 minutes) and must not be less than -# 60 (1 minute). -#radius_acct_interim_interval=600 - -# hostapd can be used as a RADIUS authentication server for other hosts. This -# requires that the integrated EAP authenticator is also enabled and both -# authentication services are sharing the same configuration. - -# File name of the RADIUS clients configuration for the RADIUS server. If this -# commented out, RADIUS server is disabled. -#radius_server_clients=/etc/hostapd/radius_clients - -# The UDP port number for the RADIUS authentication server -#radius_server_auth_port=1812 - - -##### WPA/IEEE 802.11i configuration ########################################## - -# Enable WPA. Setting this variable configures the AP to require WPA (either -# WPA-PSK or WPA-RADIUS/EAP based on other configuration). For WPA-PSK, either -# wpa_psk or wpa_passphrase must be set and wpa_key_mgmt must include WPA-PSK. -# For WPA-RADIUS/EAP, ieee8021x must be set (but without dynamic WEP keys), -# RADIUS authentication server must be configured, and WPA-EAP must be included -# in wpa_key_mgmt. -# This field is a bit field that can be used to enable WPA (IEEE 802.11i/D3.0) -# and/or WPA2 (full IEEE 802.11i/RSN): -# bit0 = WPA -# bit1 = IEEE 802.11i/RSN (WPA2) (dot11RSNAEnabled) -wpa=1 - -# WPA pre-shared keys for WPA-PSK. This can be either entered as a 256-bit -# secret in hex format (64 hex digits), wpa_psk, or as an ASCII passphrase -# (8..63 characters) that will be converted to PSK. This conversion uses SSID -# so the PSK changes when ASCII passphrase is used and the SSID is changed. -# wpa_psk (dot11RSNAConfigPSKValue) -# wpa_passphrase (dot11RSNAConfigPSKPassPhrase) -#wpa_psk=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef -wpa_passphrase=yoursecretpassphrase - -# Optionally, WPA PSKs can be read from a separate text file (containing list -# of (PSK,MAC address) pairs. This allows more than one PSK to be configured. -# Use absolute path name to make sure that the files can be read on SIGHUP -# configuration reloads. -#wpa_psk_file=/etc/hostapd/wpa_psk - -# Set of accepted key management algorithms (WPA-PSK, WPA-EAP, or both). The -# entries are separated with a space. -# (dot11RSNAConfigAuthenticationSuitesTable) -#wpa_key_mgmt=WPA-PSK WPA-EAP -wpa_key_mgmt=WPA-PSK - -# Set of accepted cipher suites (encryption algorithms) for pairwise keys -# (unicast packets). This is a space separated list of algorithms: - -# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0] -# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0] -# Group cipher suite (encryption algorithm for broadcast and multicast frames) -# is automatically selected based on this configuration. If only CCMP is -# allowed as the pairwise cipher, group cipher will also be CCMP. Otherwise, -# TKIP will be used as the group cipher. -# (dot11RSNAConfigPairwiseCiphersTable) -wpa_pairwise=TKIP CCMP - -# Time interval for rekeying GTK (broadcast/multicast encryption keys) in -# seconds. (dot11RSNAConfigGroupRekeyTime) -#wpa_group_rekey=600 - -# Rekey GTK when any STA that possesses the current GTK is leaving the BSS. -# (dot11RSNAConfigGroupRekeyStrict) -#wpa_strict_rekey=1 - -# Time interval for rekeying GMK (master key used internally to generate GTKs -# (in seconds). -#wpa_gmk_rekey=86400 - -# Enable IEEE 802.11i/RSN/WPA2 pre-authentication. This is used to speed up -# roaming be pre-authenticating IEEE 802.1X/EAP part of the full RSN -# authentication and key handshake before actually associating with a new AP. -# (dot11RSNAPreauthenticationEnabled) -#rsn_preauth=1 -# -# Space separated list of interfaces from which pre-authentication frames are -# accepted (e.g., 'eth0' or 'eth0 wlan0wds0'. This list should include all -# interface that are used for connections to other APs. This could include -# wired interfaces and WDS links. The normal wireless data interface towards -# associated stations (e.g., wlan0) should not be added, since -# pre-authentication is only used with APs other than the currently associated -# one. -#rsn_preauth_interfaces=eth0 diff --git a/config/rootfiles/common/i586/madwifi b/config/rootfiles/common/i586/madwifi deleted file mode 100644 index e3282522d5..0000000000 --- a/config/rootfiles/common/i586/madwifi +++ /dev/null @@ -1,22 +0,0 @@ -#etc/madwifi.conf -etc/modprobe.d/madwifi -usr/bin/80211debug -usr/bin/80211stats -usr/bin/ath_info -usr/bin/athchans -usr/bin/athctrl -usr/bin/athdebug -usr/bin/athkey -usr/bin/athstats -usr/bin/madwifi-unload -usr/bin/wlanconfig -usr/bin/wpakey -#usr/man/man8 -#usr/man/man8/80211debug.8 -#usr/man/man8/80211stats.8 -#usr/man/man8/athchans.8 -#usr/man/man8/athctrl.8 -#usr/man/man8/athdebug.8 -#usr/man/man8/athkey.8 -#usr/man/man8/athstats.8 -#usr/man/man8/wlanconfig.8 diff --git a/config/wpa_supplicant/config b/config/wpa_supplicant/config index 65f8b46f8d..f3e114bfd9 100644 --- a/config/wpa_supplicant/config +++ b/config/wpa_supplicant/config @@ -50,9 +50,9 @@ CONFIG_DRIVER_HOSTAP=y #CFLAGS += -I../../include/wireless # Driver interface for madwifi driver -CONFIG_DRIVER_MADWIFI=y +#CONFIG_DRIVER_MADWIFI=y # Set include directory to the madwifi source tree -CFLAGS += -I/usr/src/madwifi +#CFLAGS += -I/usr/src/madwifi # Driver interface for Prism54 driver # (Note: Prism54 is not yet supported, i.e., this will not work as-is and is diff --git a/lfs/madwifi b/lfs/madwifi deleted file mode 100644 index 2d3f97ed99..0000000000 --- a/lfs/madwifi +++ /dev/null @@ -1,93 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VERSUFIX=ipfire$(KCFG) - -VER = hal-0.10.5.6-r4119-20100201 - -THISAPP = madwifi-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX) -SUP_ARCH = i586 - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 937cf8f185ddd39b95e7ce026f9fba63 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) KERNELPATH=/usr/src/linux - cd $(DIR_APP) && make KERNELPATH=/usr/src/linux BINDIR=/usr/bin \ - MANDIR=/usr/man install - cp -f $(DIR_SRC)/config/madwifi/madwifi.conf /etc/ - ln -sf $(DIR_APP) $(DIR_SRC)/madwifi - - # Add comment to set CountryCode to germany because some cards - # are not detected without cc but others doesn't like this - echo '#options ath_pci countrycode=276' > /etc/modprobe.d/madwifi - # Blacklist ath5k or madwifi for switching between the drivers - echo 'blacklist ath_pci' >> /etc/modprobe.d/madwifi - echo '#blacklist ath5k' >> /etc/modprobe.d/madwifi - echo '#blacklist ath9k' >> /etc/modprobe.d/madwifi - - # create madwifi symlink for hostapd build - cd $(DIR_SRC) && ln -sf $(THISAPP) madwifi - - @$(POSTBUILD) diff --git a/make.sh b/make.sh index b0a692c218..755db8d9b9 100755 --- a/make.sh +++ b/make.sh @@ -385,7 +385,6 @@ buildipfire() { ipfiremake linux2 KCFG="-xen" ipfiremake kqemu KCFG="-xen" ipfiremake v4l-dvb KCFG="-xen" - ipfiremake madwifi KCFG="-xen" ipfiremake mISDN KCFG="-xen" ipfiremake dahdi KCFG="-xen" KMOD=1 ipfiremake cryptodev KCFG="-xen" @@ -401,7 +400,6 @@ buildipfire() { ipfiremake kqemu KCFG="-pae" ipfiremake kvm-kmod KCFG="-pae" ipfiremake v4l-dvb KCFG="-pae" - ipfiremake madwifi KCFG="-pae" ipfiremake alsa KCFG="-pae" KMOD=1 ipfiremake mISDN KCFG="-pae" ipfiremake dahdi KCFG="-pae" KMOD=1 @@ -418,7 +416,6 @@ buildipfire() { ipfiremake v4l-dvb KCFG="" ipfiremake kqemu KCFG="" ipfiremake kvm-kmod KCFG="" - ipfiremake madwifi KCFG="" ipfiremake alsa KCFG="" KMOD=1 ipfiremake mISDN KCFG="" ipfiremake dahdi KCFG="" KMOD=1 @@ -441,7 +438,6 @@ buildipfire() { ipfiremake v4l-dvb KCFG="-versatile" ipfiremake kqemu KCFG="-versatile" ipfiremake kvm-kmod KCFG="-versatile" - ipfiremake madwifi KCFG="-versatile" ipfiremake mISDN KCFG="-versatile" ipfiremake dahdi KCFG="-versatile" KMOD=1 ipfiremake cryptodev KCFG="-versatile" @@ -457,7 +453,6 @@ buildipfire() { ipfiremake v4l-dvb KCFG="-kirkwood" ipfiremake kqemu KCFG="-kirkwood" ipfiremake kvm-kmod KCFG="-kirkwood" - ipfiremake madwifi KCFG="-kirkwood" ipfiremake mISDN KCFG="-kirkwood" ipfiremake dahdi KCFG="-kirkwood" KMOD=1 ipfiremake cryptodev KCFG="-kirkwood" -- 2.39.2