ath9k: Add RF kill support
PATCH 1/1 ath9k: Add RF kill support
Device will be deinitialized upon any failure during RF kill registration with rfkill subsystem.
Signed-off-by Vasanthakumar Thiagarajan <[email protected]>
--- drivers/net/wireless/ath9k/Kconfig | 1 + drivers/net/wireless/ath9k/ath9k.h | 4 + drivers/net/wireless/ath9k/core.h | 16 + drivers/net/wireless/ath9k/hw.c | 64 +- drivers/net/wireless/ath9k/hw.h | 2 - drivers/net/wireless/ath9k/main.c | 1186 ++++++++++++++++++++++-------------- 6 files changed, 772 insertions(+), 501 deletions(-)
drivers/net/wireless/ath9k/Kconfig +1 -0
@@ -4,6 +4,7 @@ config ATH9K select MAC80211_LEDS select LEDS_CLASS select NEW_LEDS + select RFKILL ---help--- This module adds support for wireless adapters based on Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets.
drivers/net/wireless/ath9k/ath9k.h +4 -0
@@ -802,6 +802,8 @@ struct ath_hal {bool ah_rfkillEnabled;bool ah_isPciExpress;u16 ah_txTrigLevel; +u32 ah_rfkill_gpio ; +u32 ah_rfkill_polarity;#ifndef ATH_NF_PER_CHAN struct ath9k_nfcal_hist nfCalHist[NUM_NF_READINGS ];
@@ -1003,4 +1005,6 @@ bool ath9k_get_channel_edges(struct ath_hal *ah,void ath9k_hw_cfg_output (struct ath_hal *ah,u32 gpio,u32 ah_signal_type);void ath9k_hw_set_gpio (struct ath_hal *ah,u32 gpio,u32 value); +u32 ath9k_hw_gpio_get (struct ath_hal *ah,u32 gpio); +void ath9k_hw_cfg_gpio_input (struct ath_hal *ah,u32 gpio);#endif
drivers/net/wireless/ath9k/core.h +16 -0
@@ -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);
drivers/net/wireless/ath9k/hw.c +34 -30
91 lines not on this page · raw message
drivers/net/wireless/ath9k/hw.h +0 -2
@@ -757,8 +757,6 @@ struct ath_hal_5416 {u32 ah_ctstimeout;u32 ah_globaltxtimeout;u8 ah_gBeaconRate; -u32 ah_gpioSelect; -u32 ah_polarity;u32 ah_gpioBit;/* ANI */
drivers/net/wireless/ath9k/main.c +717 -469
1,228 lines not on this page · raw message
Signature · 1 line
1.5.5.1