greenfield \
short_gi_20 \
short_gi_40 \
+ max_amsdu \
dsss_cck_40
}
[ "$auto_channel" -gt 0 ] && channel=acs_survey
- json_get_vars noscan htmode
+ json_get_vars noscan
json_get_values ht_capab_list ht_capab
ieee80211n=1
short_gi_40:1 \
tx_stbc:1 \
rx_stbc:3 \
+ max_amsdu:1 \
dsss_cck_40:1
ht_cap_mask=0
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"
wpa_supplicant_run "$ifname" ${hostapd_ctrl:+-H $hostapd_ctrl}
}
+mac80211_setup_adhoc_htmode() {
+ case "$htmode" in
+ VHT20|HT20) ibss_htmode=HT20;;
+ HT40*|VHT40|VHT80|VHT160)
+ case "$hwmode" in
+ a)
+ case "$(( ($channel / 4) % 2 ))" in
+ 1) ibss_htmode="HT40+" ;;
+ 0) ibss_htmode="HT40-";;
+ esac
+ ;;
+ *)
+ case "$htmode" in
+ HT40+) ibss_htmode="HT40+";;
+ HT40-) ibss_htmode="HT40-";;
+ *)
+ if [ "$channel" -lt 7 ]; then
+ ibss_htmode="HT40+"
+ else
+ ibss_htmode="HT40-"
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ [ "$auto_channel" -gt 0 ] && ibss_htmode="HT40+"
+ ;;
+ *) ibss_htmode="" ;;
+ esac
+
+}
+
mac80211_setup_adhoc() {
json_get_vars bssid ssid key mcast_rate
brstr=
for br in $basic_rate_list; do
- hostapd_add_rate brstr "$br"
+ wpa_supplicant_add_rate brstr "$br"
done
mcval=
- [ -n "$mcast_rate" ] && hostapd_add_rate mcval "$mcast_rate"
+ [ -n "$mcast_rate" ] && wpa_supplicant_add_rate mcval "$mcast_rate"
- iw dev "$ifname" ibss join "$ssid" $freq $htmode fixed-freq $bssid \
+ iw dev "$ifname" ibss join "$ssid" $freq $ibss_htmode fixed-freq $bssid \
${beacon_int:+beacon-interval $beacon_int} \
${brstr:+basic-rates $brstr} \
${mcval:+mcast-rate $mcval} \
;;
adhoc)
wireless_vif_parse_encryption
+ mac80211_setup_adhoc_htmode
if [ "$wpa" -gt 0 -o "$auto_channel" -gt 0 ]; then
mac80211_setup_supplicant || failed=1
else
country chanbw distance \
txpower antenna_gain \
rxantenna txantenna \
- frag rts beacon_int
+ frag rts beacon_int htmode
json_get_values basic_rate_list basic_rate
json_select ..