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>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 21f19018fab5..e7b9e9cb39f5 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -320,7 +320,7 @@ int p54_setup_mac(struct p54_common *priv)
                 return -ENOMEM;
 
         setup = (struct p54_setup_mac *) skb_put(skb, sizeof(*setup));
-        if (priv->hw->conf.radio_enabled) {
+        if (!(priv->hw->conf.flags & IEEE80211_CONF_IDLE)) {
                 switch (priv->mode) {
                 case NL80211_IFTYPE_STATION:
                         mode = P54_FILTER_TYPE_STATION;
@@ -348,8 +348,9 @@ int p54_setup_mac(struct p54_common *priv)
                      (priv->filter_flags & FIF_OTHER_BSS)) &&
                     (mode != P54_FILTER_TYPE_PROMISCUOUS))
                         mode |= P54_FILTER_TYPE_TRANSPARENT;
-        } else
+        } else {
                 mode = P54_FILTER_TYPE_HIBERNATE;
+        }
 
         setup->mac_mode = cpu_to_le16(mode);
         memcpy(setup->mac_addr, priv->mac_addr, ETH_ALEN);