X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmac80211%2Ffiles%2Flib%2Fwifi%2Fmac80211.sh;h=942a635f78d5904b9f6d9819dcea9f307f7544b4;hb=461c02892a66114b759f4b0483ff93b643e835a5;hp=a7b3005dd9522d499235d1220ecd094f9d292414;hpb=fcd449b084a1759e37ecf6c28fc4a384eeef689e;p=openwrt.git diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/mac80211/files/lib/wifi/mac80211.sh index a7b3005dd9..942a635f78 100644 --- a/package/mac80211/files/lib/wifi/mac80211.sh +++ b/package/mac80211/files/lib/wifi/mac80211.sh @@ -66,15 +66,33 @@ disable_mac80211() ( return 0 ) - +get_freq() { + local phy="$1" + local chan="$2" + iw "$phy" info | grep -E -m1 "(\* ${chan:-....} MHz${chan:+|\\[$chan\\]})" | grep MHz | awk '{print $2}' +} enable_mac80211() { local device="$1" config_get channel "$device" channel config_get vifs "$device" vifs config_get txpower "$device" txpower + config_get country "$device" country + config_get distance "$device" distance 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 + } + + [ -n "$distance" ] && iw phy "$phy" set distance "$distance" + + export channel fixed + # convert channel to frequency + local freq="$(get_freq "$phy" "${fixed:+$channel}")" wifi_fixup_hwmode "$device" "g" for vif in $vifs; do @@ -91,6 +109,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 @@ -110,12 +129,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%%:*}" @@ -123,18 +147,18 @@ 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" fi - vif_mac="$( printf %02x $(($mac_1 + $offset)) ):$mac_2" + vif_mac="$( printf %02x $((0x$mac_1 + $offset)) ):$mac_2" } ifconfig "$ifname" hw ether "$vif_mac" # We attempt to set teh channel for all interfaces, although # mac80211 may not support it or the driver might not yet - iw dev "$ifname" set channel "$channel" + [ -n "$fixed" -a -n "$channel" ] && iw dev "$ifname" set channel "$channel" local key keystring @@ -149,26 +173,36 @@ 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 if [ ! "$mode" = "ap" ]; then case "$enc" in - wep) + *wep*) config_get keymgmt "$vif" keymgmt - if [ -e "$keymgmt" ]; then - for idx in 1 2 3 4; do - local zidx - zidx = idx - 1 - config_get key "$vif" "key${idx}" - if [ -n "$key" ]; then - append keystring "${zidx}:${key} " - fi - done + 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 ;; - wpa) + *psk*|*wpa*) config_get key "$vif" key ;; esac @@ -188,7 +222,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 @@ -213,14 +247,17 @@ enable_mac80211() { } fi ;; - sta|mesh|adhoc) - # Fixup... sometimes you have to scan to get beaconing going - iw dev "$ifname" scan &> /dev/null - case "$enc" in - wep) - if [ -e "$keymgmt" ]; then + 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" key "$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 || { @@ -232,7 +269,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 @@ -242,6 +280,9 @@ enable_mac80211() { } fi ;; + *) + iw dev "$ifname" connect "$ssid" ${fixed:+$freq} $bssid + ;; esac ;; @@ -253,7 +294,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 @@ -262,38 +303,54 @@ 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" - iw phy "$dev" info | grep -q 'HT cap' && mode_11n="n" - iw phy "$dev" info | grep -q '2412 MHz' || mode_band="a" + 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=""; + [ "$ht_cap" -gt 0 ] && { + mode_11n="n" + list=" list ht_capab" + [ "$(($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"; channel="36"; } cat <