Commit 0c8a1e43 authored by Hong Xu's avatar Hong Xu Committed by Kalle Valo

ath9k and ath9k_htc: rename variable "led_blink"

ath9k and ath9k_htc use the variable name "led_blink" to indicate
whether the module parameter "blink" is on. This name is easy to
conflict with other variables, and has caused a compiler error found
by kbuild test bot. The compiler error is as following:

drivers/net/wireless/ath/ath9k/ath9k_htc.o:(.data+0x47c): multiple definition of `led_blink'
drivers/net/wireless/ath/ath9k/ath9k.o:(.bss+0x20): first defined here

Fixes: 3a939a67 ("ath9k_htc: Add a module parameter to disable blink")
Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarHong Xu <hong@topbug.net>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 0b70dc27
...@@ -34,7 +34,7 @@ struct ath_vif; ...@@ -34,7 +34,7 @@ struct ath_vif;
extern struct ieee80211_ops ath9k_ops; extern struct ieee80211_ops ath9k_ops;
extern int ath9k_modparam_nohwcrypt; extern int ath9k_modparam_nohwcrypt;
extern int led_blink; extern int ath9k_led_blink;
extern bool is_ath9k_unloaded; extern bool is_ath9k_unloaded;
extern int ath9k_use_chanctx; extern int ath9k_use_chanctx;
......
...@@ -49,7 +49,7 @@ void ath_init_leds(struct ath_softc *sc) ...@@ -49,7 +49,7 @@ void ath_init_leds(struct ath_softc *sc)
if (AR_SREV_9100(sc->sc_ah)) if (AR_SREV_9100(sc->sc_ah))
return; return;
if (!led_blink) if (!ath9k_led_blink)
sc->led_cdev.default_trigger = sc->led_cdev.default_trigger =
ieee80211_get_radio_led_name(sc->hw); ieee80211_get_radio_led_name(sc->hw);
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
extern struct ieee80211_ops ath9k_htc_ops; extern struct ieee80211_ops ath9k_htc_ops;
extern int htc_modparam_nohwcrypt; extern int htc_modparam_nohwcrypt;
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_MAC80211_LEDS
extern int led_blink; extern int ath9k_htc_led_blink;
#endif #endif
enum htc_phymode { enum htc_phymode {
......
...@@ -279,7 +279,7 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv) ...@@ -279,7 +279,7 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv)
else else
priv->ah->led_pin = ATH_LED_PIN_DEF; priv->ah->led_pin = ATH_LED_PIN_DEF;
if (!led_blink) if (!ath9k_htc_led_blink)
priv->led_cdev.default_trigger = priv->led_cdev.default_trigger =
ieee80211_get_radio_led_name(priv->hw); ieee80211_get_radio_led_name(priv->hw);
......
...@@ -39,8 +39,8 @@ module_param_named(ps_enable, ath9k_ps_enable, int, 0444); ...@@ -39,8 +39,8 @@ module_param_named(ps_enable, ath9k_ps_enable, int, 0444);
MODULE_PARM_DESC(ps_enable, "Enable WLAN PowerSave"); MODULE_PARM_DESC(ps_enable, "Enable WLAN PowerSave");
#ifdef CONFIG_MAC80211_LEDS #ifdef CONFIG_MAC80211_LEDS
int led_blink = 1; int ath9k_htc_led_blink = 1;
module_param_named(blink, led_blink, int, 0444); module_param_named(blink, ath9k_htc_led_blink, int, 0444);
MODULE_PARM_DESC(blink, "Enable LED blink on activity"); MODULE_PARM_DESC(blink, "Enable LED blink on activity");
static const struct ieee80211_tpt_blink ath9k_htc_tpt_blink[] = { static const struct ieee80211_tpt_blink ath9k_htc_tpt_blink[] = {
......
...@@ -45,8 +45,8 @@ int ath9k_modparam_nohwcrypt; ...@@ -45,8 +45,8 @@ int ath9k_modparam_nohwcrypt;
module_param_named(nohwcrypt, ath9k_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 ath9k_led_blink;
module_param_named(blink, led_blink, int, 0444); module_param_named(blink, ath9k_led_blink, int, 0444);
MODULE_PARM_DESC(blink, "Enable LED blink on activity"); MODULE_PARM_DESC(blink, "Enable LED blink on activity");
static int ath9k_btcoex_enable; static int ath9k_btcoex_enable;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment