diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-19 23:17:12 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-19 23:17:12 (GMT) |
| commit | d950f264ff7260d8c1e124158d758db13e1ad2d0 (patch) | |
| tree | 8a8758af70d72b94e51609a5088a5739d00d8793 /drivers/net/wireless/ath9k/core.h | |
| parent | 04da2cf9bb133355b7073be25ef3ce88c8edc135 (diff) | |
| parent | 375da53b8e5e3ff2330b66b377e07a6151a93fe5 (diff) | |
| download | linux-fsl-qoriq-d950f264ff7260d8c1e124158d758db13e1ad2d0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath9k/core.h')
| -rw-r--r-- | drivers/net/wireless/ath9k/core.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath9k/core.h b/drivers/net/wireless/ath9k/core.h index 1faa1ef..b66de29 100644 --- a/drivers/net/wireless/ath9k/core.h +++ b/drivers/net/wireless/ath9k/core.h @@ -40,6 +40,7 @@ #include <asm/page.h> #include <net/mac80211.h> #include <linux/leds.h> +#include <linux/rfkill.h> #include "ath9k.h" #include "rc.h" @@ -823,6 +824,15 @@ struct ath_led { bool registered; }; +/* Rfkill */ +#define ATH_RFKILL_POLL_INTERVAL 2000 /* msecs */ + +struct ath_rfkill { + struct rfkill *rfkill; + struct delayed_work rfkill_poll; + char rfkill_name[32]; +}; + /********************/ /* Main driver core */ /********************/ @@ -906,6 +916,9 @@ struct ath_ht_info { #define SC_OP_PROTECT_ENABLE BIT(8) #define SC_OP_RXFLUSH BIT(9) #define SC_OP_LED_ASSOCIATED BIT(10) +#define SC_OP_RFKILL_REGISTERED BIT(11) +#define SC_OP_RFKILL_SW_BLOCKED BIT(12) +#define SC_OP_RFKILL_HW_BLOCKED BIT(13) struct ath_softc { struct ieee80211_hw *hw; @@ -1015,6 +1028,9 @@ struct ath_softc { struct ath_led assoc_led; struct ath_led tx_led; struct ath_led rx_led; + + /* Rfkill */ + struct ath_rfkill rf_kill; }; int ath_init(u16 devid, struct ath_softc *sc); |