diff options
author | Mohamed Abbas <mabbas@linux.intel.com> | 2008-03-28 19:21:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-01 17:13:18 -0400 |
commit | ad97edd2f524940d524c26ae273a4eb23067a7c0 (patch) | |
tree | 7d7af2310ec45dd70dfe17b1723fc66b9228d5cc /drivers/net/wireless/iwlwifi/iwl-4965.h | |
parent | c8381fdcab98b74f670d879097bab35d97d88400 (diff) |
iwlwifi: hook iwlwifi with Linux rfkill
This patch hook IWL with Linux rfkill.
Signed-off-by: Mohamed Abbas <mabbas@linux.intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h index 069e591981b2..ca864fa65ca4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965.h | |||
@@ -40,6 +40,7 @@ | |||
40 | extern struct pci_device_id iwl4965_hw_card_ids[]; | 40 | extern struct pci_device_id iwl4965_hw_card_ids[]; |
41 | 41 | ||
42 | #define DRV_NAME "iwl4965" | 42 | #define DRV_NAME "iwl4965" |
43 | #include "iwl-rfkill.h" | ||
43 | #include "iwl-eeprom.h" | 44 | #include "iwl-eeprom.h" |
44 | #include "iwl-4965-hw.h" | 45 | #include "iwl-4965-hw.h" |
45 | #include "iwl-csr.h" | 46 | #include "iwl-csr.h" |
@@ -739,6 +740,7 @@ extern int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index | |||
739 | extern int iwl4965_queue_space(const struct iwl4965_queue *q); | 740 | extern int iwl4965_queue_space(const struct iwl4965_queue *q); |
740 | struct iwl_priv; | 741 | struct iwl_priv; |
741 | 742 | ||
743 | extern void iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio); | ||
742 | /* | 744 | /* |
743 | * Forward declare iwl-4965.c functions for iwl-base.c | 745 | * Forward declare iwl-4965.c functions for iwl-base.c |
744 | */ | 746 | */ |
@@ -1050,6 +1052,9 @@ struct iwl_priv { | |||
1050 | * 4965's initialize alive response contains some calibration data. */ | 1052 | * 4965's initialize alive response contains some calibration data. */ |
1051 | struct iwl4965_init_alive_resp card_alive_init; | 1053 | struct iwl4965_init_alive_resp card_alive_init; |
1052 | struct iwl4965_alive_resp card_alive; | 1054 | struct iwl4965_alive_resp card_alive; |
1055 | #ifdef CONFIG_IWLCORE_RFKILL | ||
1056 | struct iwl_rfkill_mngr rfkill_mngr; | ||
1057 | #endif | ||
1053 | 1058 | ||
1054 | #ifdef CONFIG_IWL4965_LEDS | 1059 | #ifdef CONFIG_IWL4965_LEDS |
1055 | struct iwl4965_led led[IWL_LED_TRG_MAX]; | 1060 | struct iwl4965_led led[IWL_LED_TRG_MAX]; |