diff options
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 9bb40b002fad..02207fa62675 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
@@ -80,6 +80,11 @@ static int modparam_fastchanswitch; | |||
80 | module_param_named(fastchanswitch, modparam_fastchanswitch, bool, S_IRUGO); | 80 | module_param_named(fastchanswitch, modparam_fastchanswitch, bool, S_IRUGO); |
81 | MODULE_PARM_DESC(fastchanswitch, "Enable fast channel switching for AR2413/AR5413 radios."); | 81 | MODULE_PARM_DESC(fastchanswitch, "Enable fast channel switching for AR2413/AR5413 radios."); |
82 | 82 | ||
83 | static int ath5k_modparam_no_hw_rfkill_switch; | ||
84 | module_param_named(no_hw_rfkill_switch, ath5k_modparam_no_hw_rfkill_switch, | ||
85 | bool, S_IRUGO); | ||
86 | MODULE_PARM_DESC(no_hw_rfkill_switch, "Ignore the GPIO RFKill switch state"); | ||
87 | |||
83 | 88 | ||
84 | /* Module info */ | 89 | /* Module info */ |
85 | MODULE_AUTHOR("Jiri Slaby"); | 90 | MODULE_AUTHOR("Jiri Slaby"); |
@@ -2635,7 +2640,8 @@ int ath5k_start(struct ieee80211_hw *hw) | |||
2635 | if (ret) | 2640 | if (ret) |
2636 | goto done; | 2641 | goto done; |
2637 | 2642 | ||
2638 | ath5k_rfkill_hw_start(ah); | 2643 | if (!ath5k_modparam_no_hw_rfkill_switch) |
2644 | ath5k_rfkill_hw_start(ah); | ||
2639 | 2645 | ||
2640 | /* | 2646 | /* |
2641 | * Reset the key cache since some parts do not reset the | 2647 | * Reset the key cache since some parts do not reset the |
@@ -2719,7 +2725,8 @@ void ath5k_stop(struct ieee80211_hw *hw) | |||
2719 | 2725 | ||
2720 | cancel_delayed_work_sync(&ah->tx_complete_work); | 2726 | cancel_delayed_work_sync(&ah->tx_complete_work); |
2721 | 2727 | ||
2722 | ath5k_rfkill_hw_stop(ah); | 2728 | if (!ath5k_modparam_no_hw_rfkill_switch) |
2729 | ath5k_rfkill_hw_stop(ah); | ||
2723 | } | 2730 | } |
2724 | 2731 | ||
2725 | /* | 2732 | /* |