summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/main.c
diff options
context:
space:
mode:
authorChristian Lamparter2009-08-07 19:39:05 +0200
committerJohn W. Linville2009-08-14 15:13:45 +0200
commit6208f8b22cb24e446f24eb9f4aa9f4c3a9a1d52e (patch)
tree054637baf5739ed552a53ee5662b2317789eb487 /drivers/net/wireless/p54/main.c
parentp54: Write outside array bounds (diff)
downloadkernel-qcow2-linux-6208f8b22cb24e446f24eb9f4aa9f4c3a9a1d52e.tar.gz
kernel-qcow2-linux-6208f8b22cb24e446f24eb9f4aa9f4c3a9a1d52e.tar.xz
kernel-qcow2-linux-6208f8b22cb24e446f24eb9f4aa9f4c3a9a1d52e.zip
p54: implement rfkill
This patch implements a basic rfkill support for p54 hardware and removes a rfkill related WARNING: fwio.c: In function ‘p54_setup_mac’: fwio.c:323: warning: ‘radio_enabled’ is deprecated. by abandoning radio_enable in flavour for IEEE80211_CONF_CHANGE_IDLE. Tested-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Christian Lamparter <chunkeey@web.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/main.c')
-rw-r--r--drivers/net/wireless/p54/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index b99ee9b472b6..4a741df9c081 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -288,6 +288,11 @@ static int p54_config(struct ieee80211_hw *dev, u32 changed)
if (ret)
goto out;
}
+ if (changed & IEEE80211_CONF_CHANGE_IDLE) {
+ ret = p54_setup_mac(priv);
+ if (ret)
+ goto out;
+ }
out:
mutex_unlock(&priv->conf_mutex);