AR7 2.6.24, removed duplicate patches

[openwrt.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 cb35ef1..f52e9b0 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -5,7 +5,6 @@ scan_broadcom() {
        local wds
        local adhoc sta apmode
        local adhoc_if sta_if ap_if
-       local macfilter
 
        config_get vifs "$device" vifs
        for vif in $vifs; do
@@ -69,18 +68,6 @@ scan_broadcom() {
                        radio=0
                ;;
        esac
-       macfilter=0
-       case "$macfilter" in
-               allow|2)
-                       macfilter=allow;
-               ;;
-               deny|1)
-                       macfilter=deny;
-               ;;
-               disable|0)
-                       macfilter=disabled;
-               ;;
-       esac
 }
 
 disable_broadcom() {
@@ -127,6 +114,18 @@ enable_broadcom() {
        } || {
                slottime="${slottime:--1}"
        }
+       
+       case "$macfilter" in
+               allow|2)
+                       macfilter=2;
+               ;;
+               deny|1)
+                       macfilter=1;
+               ;;
+               disable|none|0)
+                       macfilter=0;
+               ;;
+       esac
 
        for vif in $vifs; do
                config_get mode "$vif" mode
@@ -247,7 +246,7 @@ rxant ${rxant:-3}
 txant ${txant:-3}
 
 radio ${radio:-1}
-macfilter ${macfilter:-disabled}
+macfilter ${macfilter:-0}
 maclist ${maclist:-none}
 wds none
 ${wds:+wds $wds}