---

yaml --- r: 328250 b: refs/heads/master c: 82d8eba h: refs/heads/master v: v3
git-mirror · Sep 24, 2012 · 4cd7d21 · 4cd7d21
1 parent 7dcbb07
commit 4cd7d21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 816432922bbbf67dec511711158738bfdaccb2e9
+refs/heads/master: 82d8eba358badb466a4e988ecabf0668a8d92e9c
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -304,7 +304,10 @@ static int brcms_ops_start(struct ieee80211_hw *hw)
 	wl->mute_tx = true;
 
 	if (!wl->pub->up)
-		err = brcms_up(wl);
+		if (!blocked)
+			err = brcms_up(wl);
+		else
+			err = -ERFKILL;
 	else
 		err = -ENODEV;
 	spin_unlock_bh(&wl->lock);