Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e6109c5 authored by John W. Linville's avatar John W. Linville
Browse files

ath9k: qualify global modparam_nohwcrypt variable

parent 6303710d
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -664,7 +664,7 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz)
}
}


extern struct ieee80211_ops ath9k_ops;
extern struct ieee80211_ops ath9k_ops;
extern int modparam_nohwcrypt;
extern int ath9k_modparam_nohwcrypt;
extern int led_blink;
extern int led_blink;
extern int ath9k_pm_qos_value;
extern int ath9k_pm_qos_value;
extern bool is_ath9k_unloaded;
extern bool is_ath9k_unloaded;
+3 −3
Original line number Original line Diff line number Diff line
@@ -29,8 +29,8 @@ static unsigned int ath9k_debug = ATH_DBG_DEFAULT;
module_param_named(debug, ath9k_debug, uint, 0);
module_param_named(debug, ath9k_debug, uint, 0);
MODULE_PARM_DESC(debug, "Debugging mask");
MODULE_PARM_DESC(debug, "Debugging mask");


int modparam_nohwcrypt;
int ath9k_modparam_nohwcrypt;
module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444);
module_param_named(nohwcrypt, ath9k_modparam_nohwcrypt, int, 0444);
MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");
MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");


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


	if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || modparam_nohwcrypt)
	if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || ath9k_modparam_nohwcrypt)
		hw->flags |= IEEE80211_HW_MFP_CAPABLE;
		hw->flags |= IEEE80211_HW_MFP_CAPABLE;


	hw->wiphy->interface_modes =
	hw->wiphy->interface_modes =
+1 −1
Original line number Original line Diff line number Diff line
@@ -1829,7 +1829,7 @@ static int ath9k_set_key(struct ieee80211_hw *hw,
	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
	int ret = 0;
	int ret = 0;


	if (modparam_nohwcrypt)
	if (ath9k_modparam_nohwcrypt)
		return -ENOSPC;
		return -ENOSPC;


	mutex_lock(&sc->mutex);
	mutex_lock(&sc->mutex);