aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-08-13 14:06:16 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-08-13 14:06:16 +0000
commit02780ec10082f43bcfece18c0b5c37e71f0df8a6 (patch)
treea6a5a6d062f493386077e1f5b75d40a6ec41d886
parentdbb59f014a1fc3d08c145c182f07cad0dde4d204 (diff)
downloadupstream-02780ec10082f43bcfece18c0b5c37e71f0df8a6.tar.gz
upstream-02780ec10082f43bcfece18c0b5c37e71f0df8a6.tar.bz2
upstream-02780ec10082f43bcfece18c0b5c37e71f0df8a6.zip
Fix putting mac80211 interfaces in monitor and managed modes
SVN-Revision: 12293
-rw-r--r--package/mac80211/files/lib/wifi/mac80211.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index bdf664c222..3f85864ec2 100644
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -13,14 +13,14 @@ scan_mac80211() {
config_get mode "$vif" mode
case "$mode" in
- adhoc|sta|ap)
+ adhoc|sta|ap|monitor)
append $mode "$vif"
;;
*) echo "$device($vif): Invalid mode, ignored."; continue;;
esac
done
- config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }"
+ config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}"
}
@@ -53,6 +53,7 @@ enable_mac80211() {
local first=1
for vif in $vifs; do
+ ifconfig "$ifname" down
config_get ifname "$vif" ifname
config_get enc "$vif" encryption
config_get eap_type "$vif" eap_type
@@ -73,10 +74,14 @@ enable_mac80211() {
sleep 1
iwconfig "$ifname" mode ad-hoc >/dev/null 2>/dev/null
fi
- ifconfig "$ifname" up
sleep 1
iwconfig "$ifname" channel "$channel" >/dev/null 2>/dev/null
}
+ if [ "$mode" = sta ]; then
+ iwconfig "$ifname" mode managed >/dev/null 2>/dev/null
+ else
+ iwconfig "$ifname" mode $mode >/dev/null 2>/dev/null
+ fi
wpa=
case "$enc" in