diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-06 13:30:43 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-07 13:51:50 -0500 |
| commit | c9eec95cb429359efd39a3c87fb1544fe2b77bc5 (patch) | |
| tree | 2ae15d07c7ae9cf7e03e62eae706a5abb51e6a67 /drivers/net/wireless/iwlwifi/iwl-core.c | |
| parent | b1eea297d6b522b801c95b60b1e64fb61228c6c7 (diff) | |
| download | linux-stable-c9eec95cb429359efd39a3c87fb1544fe2b77bc5.tar.gz linux-stable-c9eec95cb429359efd39a3c87fb1544fe2b77bc5.tar.bz2 linux-stable-c9eec95cb429359efd39a3c87fb1544fe2b77bc5.zip | |
iwlwifi: move rfkill status handling out of transport
The transport layer should only check the
hardware RF kill status, not impose any
policy or reaction based on it, so move
that out of it into the op_mode.
For now keep the restriction on loading
firmware, that will have to be removed
later.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 387eeeedb41d..a2ef78c6af60 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -1460,6 +1460,11 @@ void iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) { struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode); + if (state) + set_bit(STATUS_RF_KILL_HW, &priv->shrd->status); + else + clear_bit(STATUS_RF_KILL_HW, &priv->shrd->status); + wiphy_rfkill_set_hw_state(priv->hw->wiphy, state); } |