diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2013-11-11 21:59:34 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-11-11 21:59:34 +0000 |
| commit | 70ac1dbe515ae091022688f8c5725fc2df2e5366 (patch) | |
| tree | 8c8c12e2db9f888bcce5373751acc94f8a78680a /package/kernel/broadcom-wl | |
| parent | 0b42a2d718c2b7524884d80aadcb060d6c9f477e (diff) | |
| download | master-187ad058-70ac1dbe515ae091022688f8c5725fc2df2e5366.tar.gz master-187ad058-70ac1dbe515ae091022688f8c5725fc2df2e5366.tar.bz2 master-187ad058-70ac1dbe515ae091022688f8c5725fc2df2e5366.zip | |
broadcom-wl: use a single instance of 'nas' per 'wl' device
A single instance of 'nas' can support multiple interfaces; there's
no need to run multiple instances.
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38752 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/broadcom-wl')
| -rw-r--r-- | package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh index 506b077ef2..80cd9d5f3d 100644 --- a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh +++ b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh @@ -334,13 +334,15 @@ enable_broadcom() { append if_up "set_wifi_up '$vif' '$ifname'" ";$N" append if_up "start_net '$ifname' '$net_cfg'" ";$N" } - [ -z "$nasopts" ] || { + [ -z "$nas" -o -z "$nasopts" ] || { eval "${vif}_ssid=\"\$ssid\"" nas_mode="-A" [ "$mode" = "sta" ] && nas_mode="-S" - [ -z "$nas" ] || { - 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 -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 -F $nasopts" + [ -z "$nas_cmd" ] && { + local pid_file=/var/run/nas.$device.pid + nas_cmd="start-stop-daemon -S -b -p $pid_file -x $nas -- -P $pid_file -H 34954" } + append nas_cmd "-i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 -F $nasopts" } _c=$(($_c + 1)) done |