mac80211: fix interface teardown for kernels >= 2.6.33

[openwrt.git] / package / mac80211 / files / lib / wifi / mac80211.sh

diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh
index f127b28..a963db8 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -10,6 +10,7 @@ mac80211_hostapd_setup_base() {
        config_get country "$device" country
        config_get hwmode "$device" hwmode
        config_get channel "$device" channel
+       config_get_bool noscan "$device" noscan
        [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
        [ "$channel" = auto ] && channel=
        [ -n "$hwmode" ] && {
@@ -71,6 +72,7 @@ tx_queue_data0_burst=1.5
 ${hwmode:+hw_mode=$hwmode}
 ${channel:+channel=$channel}
 ${country:+country_code=$country}
+${noscan:+noscan=$noscan}
 $base_cfg
 
 EOF
@@ -163,6 +165,14 @@ scan_mac80211() {
        config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${sta:+$sta }${monitor:+$monitor }${mesh:+$mesh}"
 }
 
+list_phy_interfaces() {
+       local phy="$1"
+       if [ -d "/sys/class/ieee80211/${phy}/device/net" ]; then
+               ls "/sys/class/ieee80211/${phy}/device/net" 2>/dev/null;
+       else
+               ls "/sys/class/ieee80211/${phy}/device" 2>/dev/null | grep net: | sed -e 's,net:,,g'
+       fi
+}
 
 disable_mac80211() (
        local device="$1"
@@ -179,7 +189,7 @@ disable_mac80211() (
        done
 
        include /lib/network
-       for wdev in $(ls /sys/class/ieee80211/${phy}/device/net 2>/dev/null); do
+       for wdev in $(list_phy_interfaces "$phy"); do
                [ -f "/var/run/$wdev.pid" ] && kill $(cat /var/run/$wdev.pid) >&/dev/null 2>&1
                for pid in `pidof wpa_supplicant`; do
                        grep "$wdev" /proc/$pid/cmdline >/dev/null && \
@@ -329,20 +339,20 @@ enable_mac80211() {
                start_hostapd=1
        done
 
-       [ -n "$start_hostapd" ] || return 0
+       [ -n "$start_hostapd" ] && {
+               hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || {
+                       echo "Failed to start hostapd for $phy"
+                       return
+               }
+               sleep 2
 
-       hostapd -P /var/run/wifi-$phy.pid -B /var/run/hostapd-$phy.conf || {
-               echo "Failed to start hostapd for $phy"
-               return
+               for vif in $vifs; do
+                       config_get mode "$vif" mode
+                       config_get ifname "$vif" ifname
+                       [ "$mode" = "ap" ] || continue
+                       mac80211_start_vif "$vif" "$ifname"
+               done
        }
-       sleep 2
-
-       for vif in $vifs; do
-               config_get mode "$vif" mode
-               config_get ifname "$vif" ifname
-               [ "$mode" = "ap" ] || continue
-               mac80211_start_vif "$vif" "$ifname"
-       done
 
        for vif in $vifs; do
                config_get mode "$vif" mode
@@ -351,17 +361,16 @@ enable_mac80211() {
                ifconfig "$ifname" up
 
                if [ ! "$mode" = "ap" ]; then
-                       mac80211_start_vif "$vif" "$ifname"
-
+                       ifconfig "$ifname" up
                        case "$mode" in
                                adhoc)
                                        config_get bssid "$vif" bssid
-                                       config_get bssid "$vif" ssid
+                                       config_get ssid "$vif" ssid
                                        iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid
                                ;;
                                sta)
                                        if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
-                                               wpa_supplicant_setup_vif "$vif" wext || {
+                                               wpa_supplicant_setup_vif "$vif" nl80211 || {
                                                        echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
                                                        # make sure this wifi interface won't accidentally stay open without encryption
                                                        ifconfig "$ifname" down
@@ -370,6 +379,7 @@ enable_mac80211() {
                                        fi
                                ;;
                        esac
+                       mac80211_start_vif "$vif" "$ifname"
                fi
        done
 
@@ -414,6 +424,10 @@ detect_mac80211() {
                        [ "$(($ht_cap & 1))" -eq 1 ] && append ht_capab "$list  LDPC" "$N"
                        [ "$(($ht_cap & 32))" -eq 32 ] && append ht_capab "$list        SHORT-GI-20" "$N"
                        [ "$(($ht_cap & 64))" -eq 64 ] && append ht_capab "$list        SHORT-GI-40" "$N"
+                       [ "$(($ht_cap & 128))" -eq 128 ] && append ht_capab "$list      TX-STBC" "$N"
+                       [ "$(($ht_cap & 768))" -eq 256 ] && append ht_capab "$list      RX-STBC1" "$N"
+                       [ "$(($ht_cap & 768))" -eq 512 ] && append ht_capab "$list      RX-STBC12" "$N"
+                       [ "$(($ht_cap & 768))" -eq 768 ] && append ht_capab "$list      RX-STBC123" "$N"
                        [ "$(($ht_cap & 4096))" -eq 4096 ] && append ht_capab "$list    DSSS_CCK-40" "$N"
                }
                iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }