diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-02-17 07:54:08 -0500 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 19:06:06 -0500 |
commit | b55e75ed926ded110293b0d1e24eb6a878883115 (patch) | |
tree | 8d8d8661b7e8044e89677d4c7c2f6d92451239c5 /drivers/net/wireless/iwlwifi/iwl-core.h | |
parent | 76c9cc18fd2c8cfa5a7f66d5496d469db00eaf54 (diff) |
iwlwifi: remove STATUS_MODE_PENDING
Since rfkill integration, mac80211 can no
longer add an interface while the hardware
is not ready, so STATUS_MODE_PENDING can
never be set.
Also, remove another superfluous channel
sanity check and return the commit_rxon
return value in case it failed.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index f493248d472..bec00c79059 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -336,7 +336,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, | |||
336 | u32 changes); | 336 | u32 changes); |
337 | int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb); | 337 | int iwl_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb); |
338 | int iwl_commit_rxon(struct iwl_priv *priv); | 338 | int iwl_commit_rxon(struct iwl_priv *priv); |
339 | int iwl_set_mode(struct iwl_priv *priv, int mode); | ||
340 | int iwl_mac_add_interface(struct ieee80211_hw *hw, | 339 | int iwl_mac_add_interface(struct ieee80211_hw *hw, |
341 | struct ieee80211_vif *vif); | 340 | struct ieee80211_vif *vif); |
342 | void iwl_mac_remove_interface(struct ieee80211_hw *hw, | 341 | void iwl_mac_remove_interface(struct ieee80211_hw *hw, |
@@ -617,7 +616,6 @@ void iwlcore_free_geos(struct iwl_priv *priv); | |||
617 | #define STATUS_SCAN_HW 15 | 616 | #define STATUS_SCAN_HW 15 |
618 | #define STATUS_POWER_PMI 16 | 617 | #define STATUS_POWER_PMI 16 |
619 | #define STATUS_FW_ERROR 17 | 618 | #define STATUS_FW_ERROR 17 |
620 | #define STATUS_MODE_PENDING 18 | ||
621 | 619 | ||
622 | 620 | ||
623 | static inline int iwl_is_ready(struct iwl_priv *priv) | 621 | static inline int iwl_is_ready(struct iwl_priv *priv) |