brcm47xx: add some exports to be used by the new wl driver

[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 5350df4..976665c 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -135,7 +135,6 @@ enable_broadcom() {
 
        _c=0
        nas="$(which nas)"
-       [ -n "$nas" ] && nas="start-stop-daemon -S -b -x $nas -- "
        nas_cmd=
        if_up=
 
@@ -162,8 +161,10 @@ enable_broadcom() {
 
        case "$hwmode" in
                *b)   hwmode=0;;
+               *bg)  hwmode=1;;
                *g)   hwmode=2;;
                *gst) hwmode=4;;
+               *lrs) hwmode=5;;
                *)    hwmode=1;;
        esac
 
@@ -246,7 +247,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"
@@ -264,9 +265,9 @@ enable_broadcom() {
                                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"
 
@@ -286,11 +287,13 @@ enable_broadcom() {
                                [ -z "$bridge" ] || {
                                        append vif_post_up "supplicant 1" "$N"
                                        append vif_post_up "passphrase $key" "$N"
-                                       
+
                                        use_nas=0
                                }
                        }
-                       [ -z "$nas" -o "$use_nas" = "0" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+                       [ -z "$nas" -o "$use_nas" = "0" ] || {
+                               nas_cmd="${nas_cmd:+$nas_cmd$N}start-stop-daemon -S -b -p /var/run/nas.$ifname.pid -x $nas -- -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts"
+                       }
                }
                _c=$(($_c + 1))
        done