summaryrefslogtreecommitdiffstats
path: root/package/madwifi
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-12-22 08:02:59 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-12-22 08:02:59 +0000
commit2ba38d3a60cb90dc4f5b3cc47e33d10b993a97a6 (patch)
treec17b5d7b1f5a7ecd9410e38b9093a76722380230 /package/madwifi
parent2ea8f22fbe87280385f5795c106cc6de89052871 (diff)
nuke old madwifi init script, add new /lib/wifi handler (usable for many configurations already), fix up a target name
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5889 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi')
-rw-r--r--package/madwifi/Makefile6
-rwxr-xr-xpackage/madwifi/files/lib/wifi/madwifi.sh3
-rw-r--r--package/madwifi/files/madwifi.init5
3 files changed, 6 insertions, 8 deletions
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index b0e5be871..f59daddc1 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -41,7 +41,7 @@ ifeq ($(ARCH),powerpc)
endif
BUS:=PCI
-ifneq ($(CONFIG_LINUX_2_6_AR531X),)
+ifneq ($(CONFIG_LINUX_2_6_ATHEROS),)
BUS:=AHB
HAL_TARGET:=ap51
endif
@@ -140,8 +140,8 @@ define Build/UninstallDev
endef
define KernelPackage/madwifi/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/madwifi.init $(1)/etc/init.d/madwifi
+ $(INSTALL_DIR) $(1)/lib/wifi
+ $(INSTALL_DATA) ./files/lib/wifi/madwifi.sh $(1)/lib/wifi
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(1)/usr/sbin/
endef
diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index de9870ce6..dd030ba16 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -154,6 +154,9 @@ enable_atheros() {
}
config_set "$vif" ifname "$ifname"
+ config_get "$device" mode
+ iwpriv "$ifname" mode "${mode:-11g}"
+
config_get wds "$vif" wds
case "$wds" in
1|on|enabled) wds=1;;
diff --git a/package/madwifi/files/madwifi.init b/package/madwifi/files/madwifi.init
deleted file mode 100644
index 0c3ad3c3c..000000000
--- a/package/madwifi/files/madwifi.init
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=20
-boot() {
- iwpriv ath0 mode 3
-}