diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2008-06-13 03:44:55 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-06-14 12:18:11 -0400 |
| commit | 14a08a7fcf72a8d69cdee225cc76c50b229faa20 (patch) | |
| tree | fed4f75ab3551b205184a7cbecf6b7f532dd3c08 /drivers/net/wireless/iwlwifi/iwl-dev.h | |
| parent | 14b3d3387c95cc78f3d740ea53577d9ff41415e3 (diff) | |
iwlwifi: unify SW rf-kill flow
This patch unifies SW rf-kill flow between 4965 and 5000. It enables SW
RF-kill for 5000. This patch also solves a bug in iwl4965_mac_config:
bad mutex locking balance.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-dev.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h index c508b11b6fc8..81ff4c2c6a5a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h | |||
| @@ -653,7 +653,6 @@ static inline u8 get_cmd_index(struct iwl_queue *q, u32 index, int is_huge) | |||
| 653 | 653 | ||
| 654 | struct iwl_priv; | 654 | struct iwl_priv; |
| 655 | 655 | ||
| 656 | extern int iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio); | ||
| 657 | /* | 656 | /* |
| 658 | * Forward declare iwl-4965.c functions for iwl-base.c | 657 | * Forward declare iwl-4965.c functions for iwl-base.c |
| 659 | */ | 658 | */ |