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

Commit fe67c913 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: make LED trigger names available early 



The throughput trigger will require doing LED
classdev/trigger handling before register_hw(),
so drivers should have access to the trigger
names before it. If trigger registration fails,
this will still make the trigger name available,
but that's not a big problem since the default
trigger will the simply not be found.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 63e35cd9

net/mac80211/led.c

+16 −20
Original line number Original line Diff line number Diff line
@@ -54,12 +54,22 @@ void ieee80211_led_radio(struct ieee80211_local *local, bool enabled) 
		led_trigger_event(local->radio_led, LED_OFF);

		led_trigger_event(local->radio_led, LED_OFF);

}

}





void ieee80211_led_names(struct ieee80211_local *local)

{

	snprintf(local->rx_led_name, sizeof(local->rx_led_name),

		 "%srx", wiphy_name(local->hw.wiphy));

	snprintf(local->tx_led_name, sizeof(local->tx_led_name),

		 "%stx", wiphy_name(local->hw.wiphy));

	snprintf(local->assoc_led_name, sizeof(local->assoc_led_name),

		 "%sassoc", wiphy_name(local->hw.wiphy));

	snprintf(local->radio_led_name, sizeof(local->radio_led_name),

		 "%sradio", wiphy_name(local->hw.wiphy));

}



void ieee80211_led_init(struct ieee80211_local *local)

void ieee80211_led_init(struct ieee80211_local *local)

{

{

	local->rx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

	local->rx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

	if (local->rx_led) {

	if (local->rx_led) {

		snprintf(local->rx_led_name, sizeof(local->rx_led_name),

			 "%srx", wiphy_name(local->hw.wiphy));

		local->rx_led->name = local->rx_led_name;

		local->rx_led->name = local->rx_led_name;

		if (led_trigger_register(local->rx_led)) {

		if (led_trigger_register(local->rx_led)) {

			kfree(local->rx_led);

			kfree(local->rx_led);
@@ -69,8 +79,6 @@ void ieee80211_led_init(struct ieee80211_local *local) 




	local->tx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

	local->tx_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

	if (local->tx_led) {

	if (local->tx_led) {

		snprintf(local->tx_led_name, sizeof(local->tx_led_name),

			 "%stx", wiphy_name(local->hw.wiphy));

		local->tx_led->name = local->tx_led_name;

		local->tx_led->name = local->tx_led_name;

		if (led_trigger_register(local->tx_led)) {

		if (led_trigger_register(local->tx_led)) {

			kfree(local->tx_led);

			kfree(local->tx_led);
@@ -80,8 +88,6 @@ void ieee80211_led_init(struct ieee80211_local *local) 




	local->assoc_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

	local->assoc_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

	if (local->assoc_led) {

	if (local->assoc_led) {

		snprintf(local->assoc_led_name, sizeof(local->assoc_led_name),

			 "%sassoc", wiphy_name(local->hw.wiphy));

		local->assoc_led->name = local->assoc_led_name;

		local->assoc_led->name = local->assoc_led_name;

		if (led_trigger_register(local->assoc_led)) {

		if (led_trigger_register(local->assoc_led)) {

			kfree(local->assoc_led);

			kfree(local->assoc_led);
@@ -91,8 +97,6 @@ void ieee80211_led_init(struct ieee80211_local *local) 




	local->radio_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

	local->radio_led = kzalloc(sizeof(struct led_trigger), GFP_KERNEL);

	if (local->radio_led) {

	if (local->radio_led) {

		snprintf(local->radio_led_name, sizeof(local->radio_led_name),

			 "%sradio", wiphy_name(local->hw.wiphy));

		local->radio_led->name = local->radio_led_name;

		local->radio_led->name = local->radio_led_name;

		if (led_trigger_register(local->radio_led)) {

		if (led_trigger_register(local->radio_led)) {

			kfree(local->radio_led);

			kfree(local->radio_led);
@@ -125,9 +129,7 @@ char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw) 
{

{

	struct ieee80211_local *local = hw_to_local(hw);

	struct ieee80211_local *local = hw_to_local(hw);





	if (local->radio_led)

	return local->radio_led_name;

	return local->radio_led_name;

	return NULL;

}

}

EXPORT_SYMBOL(__ieee80211_get_radio_led_name);

EXPORT_SYMBOL(__ieee80211_get_radio_led_name);
@@ -135,9 +137,7 @@ char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw) 
{

{

	struct ieee80211_local *local = hw_to_local(hw);

	struct ieee80211_local *local = hw_to_local(hw);





	if (local->assoc_led)

	return local->assoc_led_name;

	return local->assoc_led_name;

	return NULL;

}

}

EXPORT_SYMBOL(__ieee80211_get_assoc_led_name);

EXPORT_SYMBOL(__ieee80211_get_assoc_led_name);
@@ -145,9 +145,7 @@ char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw) 
{

{

	struct ieee80211_local *local = hw_to_local(hw);

	struct ieee80211_local *local = hw_to_local(hw);





	if (local->tx_led)

	return local->tx_led_name;

	return local->tx_led_name;

	return NULL;

}

}

EXPORT_SYMBOL(__ieee80211_get_tx_led_name);

EXPORT_SYMBOL(__ieee80211_get_tx_led_name);
@@ -155,8 +153,6 @@ char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw) 
{

{

	struct ieee80211_local *local = hw_to_local(hw);

	struct ieee80211_local *local = hw_to_local(hw);





	if (local->rx_led)

	return local->rx_led_name;

	return local->rx_led_name;

	return NULL;

}

}

EXPORT_SYMBOL(__ieee80211_get_rx_led_name);
 
EXPORT_SYMBOL(__ieee80211_get_rx_led_name);

net/mac80211/led.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ extern void ieee80211_led_assoc(struct ieee80211_local *local, 
				bool associated);

				bool associated);

extern void ieee80211_led_radio(struct ieee80211_local *local,

extern void ieee80211_led_radio(struct ieee80211_local *local,

				bool enabled);

				bool enabled);

extern void ieee80211_led_names(struct ieee80211_local *local);

extern void ieee80211_led_init(struct ieee80211_local *local);

extern void ieee80211_led_init(struct ieee80211_local *local);

extern void ieee80211_led_exit(struct ieee80211_local *local);

extern void ieee80211_led_exit(struct ieee80211_local *local);

#else

#else
@@ -35,6 +36,9 @@ static inline void ieee80211_led_radio(struct ieee80211_local *local, 
				       bool enabled)

				       bool enabled)

{

{

}

}

static inline void ieee80211_led_names(struct ieee80211_local *local)

{

}

static inline void ieee80211_led_init(struct ieee80211_local *local)

static inline void ieee80211_led_init(struct ieee80211_local *local)

{

{

}

}

net/mac80211/main.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -605,6 +605,8 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len, 
	/* init dummy netdev for use w/ NAPI */

	/* init dummy netdev for use w/ NAPI */

	init_dummy_netdev(&local->napi_dev);

	init_dummy_netdev(&local->napi_dev);





	ieee80211_led_names(local);



	return local_to_hw(local);

	return local_to_hw(local);

}

}

EXPORT_SYMBOL(ieee80211_alloc_hw);

EXPORT_SYMBOL(ieee80211_alloc_hw);