X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/095085228384edbd706366fbbe61c07a75532483..c291b847846f5921d669b17478cbf59f0c83ee19:/package/madwifi/files/lib/wifi/madwifi.sh diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh index 97ad52bae..9d08e1fab 100755 --- a/package/madwifi/files/lib/wifi/madwifi.sh +++ b/package/madwifi/files/lib/wifi/madwifi.sh @@ -14,18 +14,17 @@ scan_atheros() { config_get mode "$vif" mode case "$mode" in - adhoc|ahdemo|sta|ap) + adhoc|ahdemo|sta|ap|monitor) append $mode "$vif" ;; wds) - config_get addr "$vif" bssid config_get ssid "$vif" ssid - [ -z "$addr" -a -n "$ssid" ] && { - config_set "$vif" wds 1 - config_set "$vif" mode sta - mode="sta" - addr="$ssid" - } + [ -z "$ssid" ] && continue + + config_set "$vif" wds 1 + config_set "$vif" mode sta + mode="sta" + addr="$ssid" ${addr:+append $mode "$vif"} ;; *) echo "$device($vif): Invalid mode, ignored."; continue;; @@ -43,7 +42,7 @@ scan_atheros() { *) echo "$device: Invalid mode combination in config"; return 1;; esac - config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }" + config_set "$device" vifs "${ap:+$ap }${adhoc:+$adhoc }${ahdemo:+$ahdemo }${sta:+$sta }${wds:+$wds }${monitor:+$monitor}" } @@ -127,6 +126,11 @@ enable_atheros() { esac iwpriv "$ifname" wds "$wds" + [ "$mode" = ap -a "$wds" = 1 ] && { + config_get_bool wdssep "$vif" wdssep 1 + [ -n "$wdssep" ] && iwpriv "$ifname" wdssep "$wdssep" + } + wpa= case "$enc" in WEP|wep) @@ -147,10 +151,6 @@ enable_atheros() { esac case "$mode" in - wds) - config_get addr "$vif" bssid - iwpriv "$ifname" wds_add "$addr" - ;; adhoc|ahdemo) config_get addr "$vif" bssid [ -z "$addr" ] || { @@ -190,9 +190,6 @@ enable_atheros() { config_get rts "$vif" rts [ -n "$rts" ] && iwconfig "$ifname" rts "${rts%%.*}" - config_get_bool doth "$vif" 80211h - [ -n "$doth" ] && iwpriv "$ifname" doth "$doth" - config_get_bool comp "$vif" compression [ -n "$comp" ] && iwpriv "$ifname" compression "$comp" @@ -304,7 +301,7 @@ EOF #add wpa_supplicant calls here ;; esac - [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D wext -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf + [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D madwifi -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf ;; esac first=0