netifd: fix start_disabled 'sh: bad number' in mac80211 setup (bug #19345)

[openwrt.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 1a85d15..ec0966e 100644 (file)
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -42,6 +42,7 @@ drv_mac80211_init_device_config() {
                greenfield \
                short_gi_20 \
                short_gi_40 \
+               max_amsdu \
                dsss_cck_40
 }
 
@@ -54,6 +55,7 @@ drv_mac80211_init_iface_config() {
        config_add_int maxassoc
        config_add_int max_listen_int
        config_add_int dtim_period
+       config_add_int start_disabled
 
        # mesh
        config_add_string mesh_id
@@ -132,6 +134,7 @@ mac80211_hostapd_setup_base() {
                        short_gi_40:1 \
                        tx_stbc:1 \
                        rx_stbc:3 \
+                       max_amsdu:1 \
                        dsss_cck_40:1
 
                ht_cap_mask=0
@@ -152,6 +155,7 @@ mac80211_hostapd_setup_base() {
                        RX-STBC1:0x300:0x100:1 \
                        RX-STBC12:0x300:0x200:1 \
                        RX-STBC123:0x300:0x300:1 \
+                       MAX-AMSDU-7935:0x800::$max_amsdu \
                        DSSS_CCK-40:0x1000::$dsss_cck_40
 
                ht_capab="$ht_capab$ht_capab_flags"
@@ -311,12 +315,13 @@ mac80211_hostapd_setup_bss() {
        append hostapd_cfg "$type=$ifname" "$N"
 
        hostapd_set_bss_options hostapd_cfg "$vif" || return 1
-       json_get_vars wds dtim_period max_listen_int
+       json_get_vars wds dtim_period max_listen_int start_disabled
 
        set_default wds 0
+       set_default start_disabled 0
 
        [ "$wds" -gt 0 ] && append hostapd_cfg "wds_sta=1" "$N"
-       [ "$staidx" -gt 0 ] && append hostapd_cfg "start_disabled=1" "$N"
+       [ "$staidx" -gt 0 -o "$start_disabled" -eq 1 ] && append hostapd_cfg "start_disabled=1" "$N"
 
        cat >> /var/run/hostapd-$phy.conf <<EOF
 $hostapd_cfg