X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/41d5e0ca05f7ad4827c4fea00d17bd280d83d8be..de5e66066d939a574e3b014ff659de54f3b51e1c:/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 f127b2856..af8dd2327 100644 --- 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 @@ -329,20 +331,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 +353,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 +371,7 @@ enable_mac80211() { fi ;; esac + mac80211_start_vif "$vif" "$ifname" fi done @@ -414,6 +416,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"; }