summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-trans.h
diff options
context:
space:
mode:
authorEran Harary <eran.harary@intel.com>2013-05-13 07:53:26 +0300
committerJohannes Berg <johannes.berg@intel.com>2013-05-16 23:17:29 +0200
commit4f59334bb4a626b91ea31f2bb3515e6a586ea1ae (patch)
tree90cbdb8cc087185980080efd36e4c4801431d41a /drivers/net/wireless/iwlwifi/iwl-trans.h
parent1214755c2bfc74b56093ccae797cb295e89d3400 (diff)
downloadblackbird-op-linux-4f59334bb4a626b91ea31f2bb3515e6a586ea1ae.tar.gz
blackbird-op-linux-4f59334bb4a626b91ea31f2bb3515e6a586ea1ae.zip
iwlwifi: fix initialisation while RF-kill is asserted
If RF-kill is asserted while a device is initialized, the firmware INIT image can now be run to retrieve the NVM data and register to mac80211 properly. Previously, the initialisation would fail in this scenario and the driver wouldn't register with mac80211 at all, making the device unusable. Signed-off-by: Eran Harary <eran.harary@intel.com> Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h
index 0470334d6a81..84f1c8dc9741 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -189,7 +189,8 @@ enum CMD_MODE {
CMD_SYNC = 0,
CMD_ASYNC = BIT(0),
CMD_WANT_SKB = BIT(1),
- CMD_ON_DEMAND = BIT(2),
+ CMD_SEND_IN_RFKILL = BIT(2),
+ CMD_ON_DEMAND = BIT(3),
};
#define DEF_CMD_PAYLOAD_SIZE 320
OpenPOWER on IntegriCloud