X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fkernel%2Fbroadcom-wl%2Ffiles%2Flib%2Fwifi%2Fbroadcom.sh;h=80cd9d5f3d6229432124c6244d9fe997fbd33f60;hb=b0fb4a6b50572bb3e44a2be3ca5a3c2ee085dec2;hp=506b077ef2b70669c14ee6fefa05780daa2fe713;hpb=e907d258f8a4b982d47a802d6e8b39580e3e952c;p=openwrt-working-2016%2F.git

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