X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Ffiles%2Flib%2Fwifi%2Fmac80211.sh;h=adfd948db5c6333173a1a94b0d439c18336ed2b1;hb=975e20ea80f4894a3b6611cddf6298e2a291b915;hp=bae9fb6d78cda9a14743f3e984a89cf8743faa28;hpb=244e2944c6b2f4efaf7d4375951ae2cf503823cd;p=openwrt.git diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index bae9fb6d78..adfd948db5 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -76,11 +76,13 @@ enable_mac80211() { config_get channel "$device" channel config_get vifs "$device" vifs config_get txpower "$device" txpower + config_get country "$device" country find_mac80211_phy "$device" || return 0 config_get phy "$device" phy local i=0 fixed="" + [ -n "$country" ] && iw reg set "$country" [ "$channel" = "auto" -o "$channel" = "0" ] || { fixed=1 } @@ -104,6 +106,7 @@ enable_mac80211() { config_get enc "$vif" encryption config_get mode "$vif" mode config_get ssid "$vif" ssid + config_get_bool wds "$vif" wds 0 # It is far easier to delete and create the desired interface case "$mode" in @@ -123,12 +126,17 @@ enable_mac80211() { iw phy "$phy" interface add "$ifname" type monitor ;; sta) - iw phy "$phy" interface add "$ifname" type managed + local wdsflag + [ "$wds" -gt 0 ] && wdsflag="4addr on" + iw phy "$phy" interface add "$ifname" type managed $wdsflag + config_get_bool powersave "$vif" powersave 0 + [ "$powersave" -gt 0 ] && powersave="on" || powersave="off" + iwconfig "$ifname" power "$powersave" ;; esac # All interfaces must have unique mac addresses - # which can either be explicitly set in the device + # which can either be explicitly set in the device # section, or automatically generated config_get macaddr "$device" macaddr local mac_1="${macaddr%%:*}" @@ -136,7 +144,7 @@ enable_mac80211() { config_get vif_mac "$vif" macaddr [ -n "$vif_mac" ] || { - if [ "$i" -gt 0 ]; then + if [ "$i" -gt 0 ]; then offset="$(( 2 + $i * 4 ))" else offset="0" @@ -162,7 +170,7 @@ enable_mac80211() { # none -> NO encryption # # wep + keymgmt = '' -> we use iw to connect to the - # network. + # network. # # wep + keymgmt = 'NONE' -> wpa_supplicant will be # configured to handle the wep connection @@ -170,18 +178,18 @@ enable_mac80211() { case "$enc" in wep) config_get keymgmt "$vif" keymgmt - if [ -e "$keymgmt" ]; then + if [ -n "$keymgmt" ]; then for idx in 1 2 3 4; do local zidx - zidx = idx - 1 + zidx=$(($idx - 1)) config_get key "$vif" "key${idx}" if [ -n "$key" ]; then - append keystring "${zidx}:${key} " + append keystring "${zidx}:${key} " fi done fi ;; - wpa) + *wpa*|*psk*) config_get key "$vif" key ;; esac @@ -201,7 +209,7 @@ enable_mac80211() { config_get rts "$vif" rts if [ -n "$rts" ]; then - iw phy "$phy" set rts "${frag%%.*}" + iw phy "$phy" set rts "${rts%%.*}" fi ifconfig "$ifname" up @@ -232,9 +240,9 @@ enable_mac80211() { ;; sta|mesh) config_get bssid "$vif" bssid - case "$enc" in + case "$enc" in wep) - if [ -e "$keymgmt" ]; then + if [ -n "$keymgmt" ]; then [ -n "$keystring" ] && iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid key "$keystring" else @@ -248,7 +256,8 @@ enable_mac80211() { fi fi ;; - wpa) + *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 @@ -272,7 +281,7 @@ enable_mac80211() { check_device() { config_get phy "$1" phy [ -z "$phy" ] && { - find_mac80211_phy "$1" || return 0 + find_mac80211_phy "$1" >/dev/null || return 0 config_get phy "$1" phy } [ "$phy" = "$dev" ] && found=1 @@ -281,35 +290,39 @@ check_device() { detect_mac80211() { devidx=0 config_load wireless + while :; do + config_get type "radio$devidx" type + [ -n "$type" ] || break + devidx=$(($devidx + 1)) + done for dev in $(ls /sys/class/ieee80211); do found=0 config_foreach check_device wifi-device [ "$found" -gt 0 ] && continue - while :; do - config_get type "wifi$devidx" type - [ -n "$type" ] || break - devidx=$(($devidx + 1)) - done mode_11n="" mode_band="g" - ht_cap="$(iw phy "$dev" info | grep 'HT capabilities' | cut -d: -f2)" + channel="5" + ht_cap=0 + for cap in $(iw phy "$dev" info | grep 'HT capabilities' | cut -d: -f2); do + ht_cap="$(($ht_cap | $cap))" + done ht_capab=""; - [ -n "$ht_cap" ] && { + [ "$ht_cap" -gt 0 ] && { mode_11n="n" list=" list ht_capab" - [ "$(($ht_cap & 2))" -eq 1 ] && append ht_capab "$list LDPC" "$N" + [ "$(($ht_cap & 1))" -eq 1 ] && append ht_capab "$list LDPC" "$N" [ "$(($ht_cap & 2))" -eq 2 ] && append ht_capab "$list HT40-" "$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 & 4096))" -eq 4096 ] && append ht_capab "$list DSSS_CCK-40" "$N" } - iw phy "$dev" info | grep -q '2412 MHz' || mode_band="a" + iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; } cat <