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

Commit 2489e4ea authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

ar9170: remove deprecated code 



This patch removes code (deprecated by "cfg80211: add rfkill support" )

main.c: In function 'ar9170_op_config':
main.c:1306: warning: '__IEEE80211_CONF_CHANGE_RADIO_ENABLED'
is deprecated (declared at include/net/mac80211.h:551)

and a useless device state.

Signed-off-by: default avatarChristian Lamparter <chunkeey@web.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c18bd87b

drivers/net/wireless/ath/ar9170/ar9170.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ enum ar9170_device_state { 
	AR9170_STOPPED,

	AR9170_IDLE,

	AR9170_STARTED,

	AR9170_ASSOCIATED,

};



struct ar9170_rxstream_mpdu_merge {

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

+0 −7
Original line number Diff line number Diff line
@@ -1303,11 +1303,6 @@ static int ar9170_op_config(struct ieee80211_hw *hw, u32 changed) 


	mutex_lock(&ar->mutex);



	if (changed & IEEE80211_CONF_CHANGE_RADIO_ENABLED) {

		/* TODO */

		err = 0;

	}



	if (changed & IEEE80211_CONF_CHANGE_LISTEN_INTERVAL) {

		/* TODO */

		err = 0;
@@ -1490,8 +1485,6 @@ static void ar9170_op_bss_info_changed(struct ieee80211_hw *hw, 
	}



	if (changed & BSS_CHANGED_ASSOC) {

		ar->state = bss_conf->assoc ? AR9170_ASSOCIATED : ar->state;



#ifndef CONFIG_AR9170_LEDS

		/* enable assoc LED. */

		err = ar9170_set_leds_state(ar, bss_conf->assoc ? 2 : 0);