diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/main.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index fcc087ce3bc3..3681caf54282 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -664,7 +664,7 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz) | |||
664 | } | 664 | } |
665 | 665 | ||
666 | extern struct ieee80211_ops ath9k_ops; | 666 | extern struct ieee80211_ops ath9k_ops; |
667 | extern int modparam_nohwcrypt; | 667 | extern int ath9k_modparam_nohwcrypt; |
668 | extern int led_blink; | 668 | extern int led_blink; |
669 | extern int ath9k_pm_qos_value; | 669 | extern int ath9k_pm_qos_value; |
670 | extern bool is_ath9k_unloaded; | 670 | extern bool is_ath9k_unloaded; |
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index b6643b5bf050..767d8b86f1e1 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -29,8 +29,8 @@ static unsigned int ath9k_debug = ATH_DBG_DEFAULT; | |||
29 | module_param_named(debug, ath9k_debug, uint, 0); | 29 | module_param_named(debug, ath9k_debug, uint, 0); |
30 | MODULE_PARM_DESC(debug, "Debugging mask"); | 30 | MODULE_PARM_DESC(debug, "Debugging mask"); |
31 | 31 | ||
32 | int modparam_nohwcrypt; | 32 | int ath9k_modparam_nohwcrypt; |
33 | module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444); | 33 | module_param_named(nohwcrypt, ath9k_modparam_nohwcrypt, int, 0444); |
34 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption"); | 34 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption"); |
35 | 35 | ||
36 | int led_blink; | 36 | int led_blink; |
@@ -653,7 +653,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | |||
653 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) | 653 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) |
654 | hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION; | 654 | hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION; |
655 | 655 | ||
656 | if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || modparam_nohwcrypt) | 656 | if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || ath9k_modparam_nohwcrypt) |
657 | hw->flags |= IEEE80211_HW_MFP_CAPABLE; | 657 | hw->flags |= IEEE80211_HW_MFP_CAPABLE; |
658 | 658 | ||
659 | hw->wiphy->interface_modes = | 659 | hw->wiphy->interface_modes = |
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index a818e4fd56f5..f90a6ca94a76 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c | |||
@@ -1829,7 +1829,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw, | |||
1829 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); | 1829 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); |
1830 | int ret = 0; | 1830 | int ret = 0; |
1831 | 1831 | ||
1832 | if (modparam_nohwcrypt) | 1832 | if (ath9k_modparam_nohwcrypt) |
1833 | return -ENOSPC; | 1833 | return -ENOSPC; |
1834 | 1834 | ||
1835 | mutex_lock(&sc->mutex); | 1835 | mutex_lock(&sc->mutex); |