From: Arend van Spriel <arend@broadcom.com>
Date: Thu, 10 Feb 2011 14:27:44 +0000 (+0100)
Subject: staging: brcm80211: remove warning introduced by rfkill implementation
X-Git-Tag: v2.6.39-rc1~469^2~532
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=77919fd72e96cb75ed1b3fc0921a6b5cef5f8042;p=~emulex%2Finfiniband.git

staging: brcm80211: remove warning introduced by rfkill implementation

During rfkill implementation the content of wlc_radio_upd function
was removed for testing purposes only. This ended up in the patch
sent out. This commit restores the function content, which was the
only function calling static function wlc_radio_enable. This removes
the compilation warning observed.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index 4515f17da41..96e6ce41fca 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -2311,6 +2311,11 @@ void wlc_radio_mpc_upd(struct wlc_info *wlc)
  */
 static void wlc_radio_upd(struct wlc_info *wlc)
 {
+	if (wlc->pub->radio_disabled) {
+		wlc_radio_disable(wlc);
+	} else {
+		wlc_radio_enable(wlc);
+	}
 }
 
 /* maintain LED behavior in down state */