Skip to content

Commit 3e6109c

Browse files
committed
ath9k: qualify global modparam_nohwcrypt variable
Signed-off-by: John W. Linville <linville@tuxdriver.com>
1 parent 6303710 commit 3e6109c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

drivers/net/wireless/ath/ath9k/ath9k.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz)
664664
}
665665

666666
extern struct ieee80211_ops ath9k_ops;
667-
extern int modparam_nohwcrypt;
667+
extern int ath9k_modparam_nohwcrypt;
668668
extern int led_blink;
669669
extern int ath9k_pm_qos_value;
670670
extern bool is_ath9k_unloaded;

drivers/net/wireless/ath/ath9k/init.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ static unsigned int ath9k_debug = ATH_DBG_DEFAULT;
2929
module_param_named(debug, ath9k_debug, uint, 0);
3030
MODULE_PARM_DESC(debug, "Debugging mask");
3131

32-
int modparam_nohwcrypt;
33-
module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444);
32+
int ath9k_modparam_nohwcrypt;
33+
module_param_named(nohwcrypt, ath9k_modparam_nohwcrypt, int, 0444);
3434
MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");
3535

3636
int led_blink;
@@ -653,7 +653,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
653653
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
654654
hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;
655655

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)
657657
hw->flags |= IEEE80211_HW_MFP_CAPABLE;
658658

659659
hw->wiphy->interface_modes =

drivers/net/wireless/ath/ath9k/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1829,7 +1829,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
18291829
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
18301830
int ret = 0;
18311831

1832-
if (modparam_nohwcrypt)
1832+
if (ath9k_modparam_nohwcrypt)
18331833
return -ENOSPC;
18341834

18351835
mutex_lock(&sc->mutex);

0 commit comments

Comments
 (0)