From 4cd7d218d7264db03a3dd10b6b33189d4528e821 Mon Sep 17 00:00:00 2001
From: Piotr Haber <phaber@broadcom.com>
Date: Wed, 19 Sep 2012 22:21:15 +0200
Subject: [PATCH] --- yaml --- r: 328250 b: refs/heads/master c:
 82d8eba358badb466a4e988ecabf0668a8d92e9c h: refs/heads/master v: v3

---
 [refs]                                                      | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 90c4c78bffe0..d227bf54a35c 100644
--- 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
index 718da8d6d658..a744ea5a9559 100644
--- 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);