mac80211: implement wds sta support (wds ap support work in progress, needs hostapd...

[openwrt/svn-archive/archive.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 6c5359a1bbe7bb98b64a469c2ceef7afde736830..027749e57841896ff422ba49e5f970b5298c54fa 100644 (file)
--- a/package/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/mac80211/files/lib/wifi/mac80211.sh
@@ -104,6 +104,7 @@ enable_mac80211() {
                config_get enc "$vif" encryption
                config_get mode "$vif" mode
                config_get ssid "$vif" ssid
+               config_get_bool wds "$vif" wds 0
 
                # It is far easier to delete and create the desired interface
                case "$mode" in
@@ -123,7 +124,9 @@ enable_mac80211() {
                                iw phy "$phy" interface add "$ifname" type monitor
                        ;;
                        sta)
-                               iw phy "$phy" interface add "$ifname" type managed
+                               local wdsflag
+                               [ "$wds" -gt 0 ] && wdsflag="wds on"
+                               iw phy "$phy" interface add "$ifname" type managed $wdsflag
                        ;;
                esac
 
@@ -248,7 +251,8 @@ enable_mac80211() {
                                                        fi
                                                fi
                                        ;;
-                                       wpa)
+                                       wpa*|psk*)
+                                               config_get key "$vif" key
                                                if eval "type wpa_supplicant_setup_vif" 2>/dev/null >/dev/null; then
                                                        wpa_supplicant_setup_vif "$vif" wext || {
                                                                echo "enable_mac80211($device): Failed to set up wpa_supplicant for interface $ifname" >&2
@@ -293,7 +297,20 @@ detect_mac80211() {
                done
                mode_11n=""
                mode_band="g"
-               iw phy "$dev" info | grep -q 'HT cap' && mode_11n="n"
+               ht_cap=0
+               for cap in $(iw phy "$dev" info | grep 'HT capabilities' | cut -d: -f2); do
+                       ht_cap="$(($ht_cap | $cap))"
+               done
+               ht_capab="";
+               [ "$ht_cap" -gt 0 ] && {
+                       mode_11n="n"
+                       list="  list ht_capab"
+                       [ "$(($ht_cap & 2))" -eq 1 ] && append ht_capab "$list  LDPC" "$N"
+                       [ "$(($ht_cap & 2))" -eq 2 ] && append ht_capab "$list  HT40-" "$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 & 4096))" -eq 4096 ] && append ht_capab "$list    DSSS_CCK-40" "$N"
+               }
                iw phy "$dev" info | grep -q '2412 MHz' || mode_band="a"
 
                cat <<EOF
@@ -304,6 +321,7 @@ config wifi-device  wifi$devidx
        option hwmode   11${mode_11n}${mode_band}
        # REMOVE THIS LINE TO ENABLE WIFI:
        option disabled 1
+$ht_capab
 
 config wifi-iface
        option device   wifi$devidx