cfg80211: add rfkill support

To be easier on drivers and users, have cfg80211 register an
rfkill structure that drivers can access. When soft-killed,
simply take down all interfaces; when hard-killed the driver
needs to notify us and we will take down the interfaces
after the fact. While rfkilled, interfaces cannot be set UP.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

4 files changed, 18 insertions, 15 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 81258acf48bc..a9211cc183cb 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1340,7 +1340,6 @@ static int ieee80211_set_tx_power(struct wiphy *wiphy,
         struct ieee80211_local *local = wiphy_priv(wiphy);
         struct ieee80211_channel *chan = local->hw.conf.channel;
         u32 changes = 0;
-        bool radio_enabled = true;
 
         switch (type) {
         case TX_POWER_AUTOMATIC:
@@ -1359,14 +1358,6 @@ static int ieee80211_set_tx_power(struct wiphy *wiphy,
                         return -EINVAL;
                 local->user_power_level = dbm;
                 break;
-        case TX_POWER_OFF:
-                radio_enabled = false;
-                break;
-        }
-
-        if (radio_enabled != local->hw.conf.radio_enabled) {
-                changes |= IEEE80211_CONF_CHANGE_RADIO_ENABLED;
-                local->hw.conf.radio_enabled = radio_enabled;
         }
 
         ieee80211_hw_config(local, changes);
@@ -1380,12 +1371,16 @@ static int ieee80211_get_tx_power(struct wiphy *wiphy, int *dbm)
 
         *dbm = local->hw.conf.power_level;
 
-        if (!local->hw.conf.radio_enabled)
-                return -ENETDOWN;
-
         return 0;
 }
 
+static void ieee80211_rfkill_poll(struct wiphy *wiphy)
+{
+        struct ieee80211_local *local = wiphy_priv(wiphy);
+
+        drv_rfkill_poll(local);
+}
+
 struct cfg80211_ops mac80211_config_ops = {
         .add_virtual_intf = ieee80211_add_iface,
         .del_virtual_intf = ieee80211_del_iface,
@@ -1427,4 +1422,5 @@ struct cfg80211_ops mac80211_config_ops = {
         .set_wiphy_params = ieee80211_set_wiphy_params,
         .set_tx_power = ieee80211_set_tx_power,
         .get_tx_power = ieee80211_get_tx_power,
+        .rfkill_poll = ieee80211_rfkill_poll,
 };
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 3912b5334b9c..b13446afd48f 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -181,4 +181,11 @@ static inline int drv_ampdu_action(struct ieee80211_local *local,
                                                 sta, tid, ssn);
         return -EOPNOTSUPP;
 }
+
+
+static inline void drv_rfkill_poll(struct ieee80211_local *local)
+{
+        if (local->ops->rfkill_poll)
+                local->ops->rfkill_poll(&local->hw);
+}
 #endif /* __MAC80211_DRIVER_OPS */
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8c9f1c722cdb..b7c8a4484298 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -170,7 +170,7 @@ static int ieee80211_open(struct net_device *dev)
                         goto err_del_bss;
                 /* we're brought up, everything changes */
                 hw_reconf_flags = ~0;
-                ieee80211_led_radio(local, local->hw.conf.radio_enabled);
+                ieee80211_led_radio(local, true);
         }
 
         /*
@@ -560,7 +560,7 @@ static int ieee80211_stop(struct net_device *dev)
 
                 drv_stop(local);
 
-                ieee80211_led_radio(local, 0);
+                ieee80211_led_radio(local, false);
 
                 flush_workqueue(local->hw.workqueue);
 
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 31284c984e38..22f63815fb36 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -973,7 +973,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         if (local->open_count) {
                 res = drv_start(local);
 
-                ieee80211_led_radio(local, hw->conf.radio_enabled);
+                ieee80211_led_radio(local, true);
         }
 
         /* add interfaces */