summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-4965.h
diff options
context:
space:
mode:
authorMohamed Abbas2008-03-29 00:21:06 +0100
committerJohn W. Linville2008-04-01 23:13:18 +0200
commitad97edd2f524940d524c26ae273a4eb23067a7c0 (patch)
tree7d7af2310ec45dd70dfe17b1723fc66b9228d5cc /drivers/net/wireless/iwlwifi/iwl-4965.h
parentiwlwifi: add notification infrastructure to iwlcore (diff)
downloadkernel-qcow2-linux-ad97edd2f524940d524c26ae273a4eb23067a7c0.tar.gz
kernel-qcow2-linux-ad97edd2f524940d524c26ae273a4eb23067a7c0.tar.xz
kernel-qcow2-linux-ad97edd2f524940d524c26ae273a4eb23067a7c0.zip
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.h5
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 @@
extern struct pci_device_id iwl4965_hw_card_ids[];
#define DRV_NAME "iwl4965"
+#include "iwl-rfkill.h"
#include "iwl-eeprom.h"
#include "iwl-4965-hw.h"
#include "iwl-csr.h"
@@ -739,6 +740,7 @@ extern int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index
extern int iwl4965_queue_space(const struct iwl4965_queue *q);
struct iwl_priv;
+extern void iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio);
/*
* Forward declare iwl-4965.c functions for iwl-base.c
*/
@@ -1050,6 +1052,9 @@ struct iwl_priv {
* 4965's initialize alive response contains some calibration data. */
struct iwl4965_init_alive_resp card_alive_init;
struct iwl4965_alive_resp card_alive;
+#ifdef CONFIG_IWLCORE_RFKILL
+ struct iwl_rfkill_mngr rfkill_mngr;
+#endif
#ifdef CONFIG_IWL4965_LEDS
struct iwl4965_led led[IWL_LED_TRG_MAX];