remove mac address handling, now handled by /lib/network/config.sh

[openwrt/staging/yousong.git] / 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 e60674a49728d0473fadf6c79a4ca0eb0ecfacea..e0d741b952fdc29cdce205f57639a96311d1f2ce 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -117,13 +117,13 @@ 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
        config_get macaddr "$device" macaddr
-       local vif_pre_up vif_post_up vif_do_up
+       local vif_pre_up vif_post_up vif_do_up txpower
 
        _c=0
        nas="$(which nas)"
@@ -152,6 +152,8 @@ enable_broadcom() {
        esac
 
        for vif in $vifs; do
+               config_get txpower "$vif" txpower
+
                config_get mode "$vif" mode
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
@@ -235,7 +237,7 @@ enable_broadcom() {
                
                config_get ifname "$vif" ifname
                #append if_up "ifconfig $ifname up" ";$N"
-               [ -z "$macaddr" ] || append if_up "ifconfig $ifname hw ether $macaddr" ";$N"
+
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {
@@ -271,8 +273,8 @@ infra $infra
 ${wet:+wet 1}
 802.11d 0
 802.11h 0
-rxant ${rxant:-3}
-txant ${txant:-3}
+rxant ${rxantenna:-3}
+txant ${txantenna:-3}
 monitor ${monitor:-0}
 passive ${passive:-0}
 
@@ -295,6 +297,8 @@ EOF
        wlc stdin <<EOF
 $vif_do_up
 EOF
+       [ -z "$txpower" ] || iwconfig $device txpower ${txpower}dBm 
+
        eval "$nas_cmd"
 }