From 88e7da2babd4cc61032f2047525cfd1c56d09068 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 22 Dec 2006 08:02:59 +0000 Subject: [PATCH] nuke old madwifi init script, add new /lib/wifi handler (usable for many configurations already), fix up a target name SVN-Revision: 5889 --- package/madwifi/Makefile | 6 +++--- package/madwifi/files/lib/wifi/madwifi.sh | 3 +++ package/madwifi/files/madwifi.init | 5 ----- 3 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 package/madwifi/files/madwifi.init diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index b0e5be8712..f59daddc1d 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 de9870ce65..dd030ba169 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 0c3ad3c3c1..0000000000 --- a/package/madwifi/files/madwifi.init +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh /etc/rc.common -START=20 -boot() { - iwpriv ath0 mode 3 -}