mac80211: disable 802.11n support if htmode is not set to HT* or VHT*

[openwrt/staging/yousong.git] / package / kernel / mac80211 / files / lib / netifd / wireless / mac80211.sh

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index 52e58beb519ebf0e316e1916d86fe1ebe92c32c9..c96b4a353be25e01f67a482b1307e87bd75ceb2f 100644 (file)
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -17,7 +17,7 @@ MP_CONFIG_STRING="mesh_power_mode"
 drv_mac80211_init_device_config() {
        hostapd_common_add_device_config
 
-       config_add_string path phy macaddr
+       config_add_string path phy 'macaddr:macaddr'
        config_add_string hwmode
        config_add_int beacon_int chanbw frag rts
        config_add_int rxantenna txantenna antenna_gain txpower distance
@@ -42,7 +42,7 @@ drv_mac80211_init_device_config() {
 drv_mac80211_init_iface_config() {
        hostapd_common_add_bss_config
 
-       config_add_string macaddr ifname
+       config_add_string 'macaddr:macaddr' ifname
 
        config_add_boolean wds powersave
        config_add_int maxassoc
@@ -50,6 +50,7 @@ drv_mac80211_init_iface_config() {
        config_add_int dtim_interval
 
        # mesh
+       config_add_string mesh_id
        config_add_int $MP_CONFIG_INT
        config_add_boolean $MP_CONFIG_BOOL
        config_add_string $MP_CONFIG_STRING
@@ -66,18 +67,21 @@ mac80211_hostapd_setup_base() {
                json_get_vars noscan htmode
                json_get_values ht_capab_list ht_capab
 
-               append base_cfg "ieee80211n=1" "$N"
-
+               ieee80211n=1
                ht_capab=
                case "$htmode" in
-                       HT20|HT40-|HT40+) ht_capab="[$htmode]";;
-                       VHT40|VHT80|VHT160)
-                               case "$channel" in
-                                       36|44|52|60|100|108|116|124|132|140|149|157) ht_capab="[HT40+]";;
-                                       40|48|56|64|104|112|120|128|136|144|153|161) ht_capab="[HT40-]";;
+                       HT20) ;;
+                       HT40*|VHT40|VHT80|VHT160)
+                               case "$(( ($channel / 4) % 2 ))" in
+                                       1) ht_capab="[HT40+]";;
+                                       0) ht_capab="[HT40-]";;
                                esac
-                               ;;
+                       ;;
+                       *) ieee80211n= ;;
                esac
+
+               [ -n "$ieee80211n" ] && append base_cfg "ieee80211n=1" "$N"
+
                for cap in $ht_capab_list; do
                        ht_capab="$ht_capab[$cap]"
                done
@@ -89,32 +93,20 @@ mac80211_hostapd_setup_base() {
                idx="$channel"
                case "$htmode" in
                        VHT40)
-                               case "$channel" in
-                                       36|40) idx=38;;
-                                       44|48) idx=42;;
-                                       52|56) idx=54;;
-                                       60|64) idx=58;;
-                                       100|104) idx=102;;
-                                       108|112) idx=110;;
-                                       116|120) idx=118;;
-                                       124|128) idx=126;;
-                                       132|136) idx=134;;
-                                       140|144) idx=142;;
-                                       149|153) idx=151;;
-                                       157|161) idx=159;;
+                               case "$(( ($channel / 4) % 2 ))" in
+                                       1) idx=$(($channel + 2));;
+                                       0) idx=$(($channel - 2));;
                                esac
                                enable_ac=1
                                append base_cfg "vht_oper_chwidth=0" "$N"
                                append base_cfg "vht_oper_centr_freq_seg0_idx=$idx" "$N"
                        ;;
                        VHT80)
-                               case "$channel" in
-                                       36|40|44|48) idx=42;;
-                                       52|56|60|64) idx=58;;
-                                       100|104|108|112) idx=106;;
-                                       116|120|124|128) idx=122;;
-                                       132|136|140|144) idx=138;;
-                                       149|153|157|161) idx=155;;
+                               case "$(( ($channel / 4) % 2 ))" in
+                                       1) idx=$(($channel + 6));;
+                                       2) idx=$(($channel + 2));;
+                                       3) idx=$(($channel - 2));;
+                                       0) idx=$(($channel - 6));;
                                esac
                                enable_ac=1
                                append base_cfg "vht_oper_chwidth=1" "$N"
@@ -448,6 +440,7 @@ mac80211_setup_adhoc() {
 
 mac80211_setup_vif() {
        local name="$1"
+       local failed
 
        json_select data
        json_get_vars ifname
@@ -472,7 +465,19 @@ mac80211_setup_vif() {
                                json_get_var mp_val "$var"
                                [ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
                        done
-                       # todo: authsae
+
+                       # authsae
+                       json_get_vars key
+                       if [ -n "$key" ]; then
+                               if [ -e "/lib/wifi/authsae.sh" ]; then
+                                       . /lib/wifi/authsae.sh
+                                       authsae_start_interface || failed=1
+                               else
+                                       wireless_setup_vif_failed AUTHSAE_NOT_INSTALLED
+                                       json_select ..
+                                       return
+                               fi
+                       fi
                ;;
                adhoc)
                        wireless_vif_parse_encryption