X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1fc373c5d3e13bc9076efc144d47f6b28969ab99..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 62b8e7ed3..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 @@ -234,7 +236,6 @@ enable_mac80211() { } config_set "$vif" ifname "$ifname" - config_get enc "$vif" encryption config_get mode "$vif" mode config_get ssid "$vif" ssid @@ -288,57 +289,19 @@ enable_mac80211() { [ "$mode" = "ap" ] || ifconfig "$ifname" hw ether "$vif_mac" config_set "$vif" macaddr "$vif_mac" - # Valid values are: - # wpa / wep / none - # # !! ap !! # # ALL ap functionality will be passed to hostapd # - # !! mesh / adhoc / station !! - # none -> NO encryption + # !! station !! # - # wep + keymgmt = '' -> we use iw to connect to the - # network. + # ALL station functionality will be passed to wpa_supplicant # - # wep + keymgmt = 'NONE' -> wpa_supplicant will be - # configured to handle the wep connection if [ ! "$mode" = "ap" ]; then # We attempt to set the channel for all interfaces, although # mac80211 may not support it or the driver might not yet # for ap mode this is handled by hostapd [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel" - - local key keystring - - case "$enc" in - *wep*) - config_get keymgmt "$vif" keymgmt - if [ -z "$keymgmt" ]; then - config_get key "$vif" key - key="${key:-1}" - case "$key" in - [1234]) - for idx in 1 2 3 4; do - local zidx - zidx=$(($idx - 1)) - config_get ckey "$vif" "key${idx}" - if [ -n "$ckey" ]; then - [ $idx -eq $key ] && zidx="d:${zidx}" - append keystring "${zidx}:$(prepare_key_wep "$ckey")" - fi - done - ;; - *) - keystring="d:0:$(prepare_key_wep "$key")" - ;; - esac - fi - ;; - *psk*|*wpa*) - config_get key "$vif" key - ;; - esac fi # txpower is not yet implemented in iw @@ -357,52 +320,6 @@ enable_mac80211() { if [ -n "$rts" ]; then iw phy "$phy" set rts "${rts%%.*}" fi - - ifconfig "$ifname" up - - [ "$mode" = "ap" ] || mac80211_start_vif "$vif" "$ifname" - - case "$mode" in - adhoc) - config_get bssid "$vif" bssid - iw dev "$ifname" ibss join "$ssid" $freq ${fixed:+fixed-freq} $bssid - ;; - sta|mesh) - config_get bssid "$vif" bssid - case "$enc" in - *wep*) - if [ -z "$keymgmt" ]; then - [ -n "$keystring" ] && - iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key $keystring - else - 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 - # make sure this wifi interface won't accidentally stay open without encryption - ifconfig "$ifname" down - continue - } - fi - fi - ;; - *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 - # make sure this wifi interface won't accidentally stay open without encryption - ifconfig "$ifname" down - continue - } - fi - ;; - *) - iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid - ;; - esac - - ;; - esac done local start_hostapd= @@ -414,20 +331,50 @@ 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" + [ ! "$mode" = "ap" ] || continue + ifconfig "$ifname" up + + if [ ! "$mode" = "ap" ]; then + ifconfig "$ifname" up + case "$mode" in + adhoc) + config_get bssid "$vif" bssid + 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" 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 + continue + } + fi + ;; + esac + mac80211_start_vif "$vif" "$ifname" + fi done + } @@ -469,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"; }