X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/baf609d512de12afdfdec9723b6d79a6cd8e61f9..e8be3016c98c2e7d81755c4eae34ea3c60f4b3f9:/package/broadcom-wl/files/lib/wifi/broadcom.sh diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh index ece3a6961..bfb7ed25e 100644 --- a/package/broadcom-wl/files/lib/wifi/broadcom.sh +++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh @@ -42,7 +42,7 @@ scan_broadcom() { local _c= for vif in ${adhoc_if:-$sta_if $ap_if $mon_if}; do - config_set "$vif" ifname "wl0${_c:+.$_c}" + config_set "$vif" ifname "${device}${_c:+.$_c}" _c=$((${_c:-0} + 1)) done config_set "$device" vifs "${adhoc_if:-$sta_if $ap_if $mon_if}" @@ -93,13 +93,14 @@ scan_broadcom() { } disable_broadcom() { - set_wifi_down "$1" - wlc down + local device="$1" + set_wifi_down "$device" + wlc ifname "$device" down ( include /lib/network # make sure the interfaces are down and removed from all bridges - for dev in wl0 wl0.1 wl0.2 wl0.3; do + for dev in $device ${device}.1 ${device}.2 ${device}.3; do ifconfig "$dev" down 2>/dev/null >/dev/null && { unbridge "$dev" } @@ -109,6 +110,7 @@ disable_broadcom() { } enable_broadcom() { + local device="$1" local _c config_get channel "$device" channel config_get country "$device" country @@ -117,15 +119,23 @@ enable_broadcom() { config_get vifs "$device" vifs config_get distance "$device" distance config_get slottime "$device" slottime - config_get rxant "$device" rxant - config_get txant "$device" txant + config_get rxantenna "$device" rxantenna + config_get txantenna "$device" txantenna config_get_bool frameburst "$device" frameburst config_get macfilter "$device" macfilter config_get maclist "$device" maclist - local vif_pre_up vif_post_up vif_do_up + config_get macaddr "$device" macaddr + config_get txpower "$device" txpower + config_get frag "$device" frag + config_get rts "$device" rts + config_get hwmode "$device" hwmode + local vif_pre_up vif_post_up vif_do_up vif_txpower + local doth=0 + local wmm=0 _c=0 nas="$(which nas)" + [ -n "$nas" ] && nas="start-stop-daemon -S -b -x $nas -- " nas_cmd= if_up= @@ -137,7 +147,7 @@ enable_broadcom() { } || { slottime="${slottime:--1}" } - + case "$macfilter" in allow|2) macfilter=2; @@ -150,12 +160,26 @@ enable_broadcom() { ;; esac + case "$hwmode" in + *b) hwmode=0;; + *bg) hwmode=1;; + *g) hwmode=2;; + *gst) hwmode=4;; + *lrs) hwmode=5;; + *) hwmode=1;; + esac + for vif in $vifs; do + config_get vif_txpower "$vif" txpower + config_get mode "$vif" mode append vif_pre_up "vif $_c" "$N" append vif_post_up "vif $_c" "$N" append vif_do_up "vif $_c" "$N" - + + config_get_bool wmm "$vif" wmm "$wmm" + config_get_bool doth "$vif" doth "$doth" + [ "$mode" = "sta" ] || { config_get_bool hidden "$vif" hidden 0 append vif_pre_up "closed $hidden" "$N" @@ -170,11 +194,15 @@ enable_broadcom() { nasopts= config_get enc "$vif" encryption case "$enc" in - WEP|wep) + *WEP*|*wep*) wsec_r=1 wsec=1 defkey=1 config_get key "$vif" key + case "$enc" in + *shared*) append vif_do_up "wepauth 1" "$N";; + *) append vif_do_up "wepauth 0" "$N";; + esac case "$key" in [1234]) defkey="$key" @@ -195,6 +223,7 @@ enable_broadcom() { case "$enc" in wpa*+wpa2*|WPA*+WPA2*|*psk+*psk2|*PSK+*PSK2) auth=132; wsec=6;; wpa2*|WPA2*|*PSK2|*psk2) auth=128; wsec=4;; + *aes|*AES) auth=4; wsec=4;; *) auth=4; wsec=2;; esac eval "${vif}_key=\"\$key\"" @@ -219,7 +248,7 @@ enable_broadcom() { append vif_do_up "wpa_auth $auth" "$N" append vif_do_up "wsec_restrict $wsec_r" "$N" append vif_do_up "eap_restrict $eap_r" "$N" - + config_get ssid "$vif" ssid append vif_post_up "vlan_mode 0" "$N" append vif_post_up "ssid $ssid" "$N" @@ -229,17 +258,26 @@ enable_broadcom() { append vif_post_up "monitor $monitor" "$N" append vif_post_up "passive $passive" "$N" } - + + [ "$mode" = "adhoc" ] && { + config_get bssid "$vif" bssid + [ -n "$bssid" ] && { + append vif_pre_up "des_bssid $bssid" "$N" + append vif_pre_up "allow_mode 1" "$N" + } + } || append vif_pre_up "allow_mode 0" "$N" + append vif_post_up "enabled 1" "$N" - + config_get ifname "$vif" ifname #append if_up "ifconfig $ifname up" ";$N" + local net_cfg bridge net_cfg="$(find_net_config "$vif")" [ -z "$net_cfg" ] || { bridge="$(bridge_interface "$net_cfg")" - append if_up "start_net '$ifname' '$net_cfg'" ";$N" append if_up "set_wifi_up '$vif' '$ifname'" ";$N" + append if_up "start_net '$ifname' '$net_cfg' \$(wlc ifname '$ifname' bssid)" ";$N" } [ -z "$nasopts" ] || { eval "${vif}_ssid=\"\$ssid\"" @@ -250,7 +288,7 @@ enable_broadcom() { [ -z "$bridge" ] || { append vif_post_up "supplicant 1" "$N" append vif_post_up "passphrase $key" "$N" - + use_nas=0 } } @@ -259,18 +297,22 @@ enable_broadcom() { _c=$(($_c + 1)) done killall -KILL nas >&- 2>&- - wlc stdin <