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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct ath_vif; 


extern struct ieee80211_ops ath9k_ops;

extern int ath9k_modparam_nohwcrypt;

extern int led_blink;

extern int ath9k_led_blink;

extern bool is_ath9k_unloaded;

extern int ath9k_use_chanctx;

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ void ath_init_leds(struct ath_softc *sc) 
	if (AR_SREV_9100(sc->sc_ah))

		return;



	if (!led_blink)

	if (!ath9k_led_blink)

		sc->led_cdev.default_trigger =

			ieee80211_get_radio_led_name(sc->hw);

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
extern struct ieee80211_ops ath9k_htc_ops;

extern int htc_modparam_nohwcrypt;

#ifdef CONFIG_MAC80211_LEDS

extern int led_blink;

extern int ath9k_htc_led_blink;

#endif



enum htc_phymode {

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

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv) 
	else

		priv->ah->led_pin = ATH_LED_PIN_DEF;



	if (!led_blink)

	if (!ath9k_htc_led_blink)

		priv->led_cdev.default_trigger =

			ieee80211_get_radio_led_name(priv->hw);

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

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ module_param_named(ps_enable, ath9k_ps_enable, int, 0444); 
MODULE_PARM_DESC(ps_enable, "Enable WLAN PowerSave");



#ifdef CONFIG_MAC80211_LEDS

int led_blink = 1;

module_param_named(blink, led_blink, int, 0444);

int ath9k_htc_led_blink = 1;

module_param_named(blink, ath9k_htc_led_blink, int, 0444);

MODULE_PARM_DESC(blink, "Enable LED blink on activity");



static const struct ieee80211_tpt_blink ath9k_htc_tpt_blink[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE