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

Commit 285256a5 authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

mac80211: no need for ht.enabled 



We can simply use conf_is_ht() check where needed.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent de27e64e

include/net/mac80211.h

+0 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void) 
#define IEEE80211_CONF_SHORT_SLOT_TIME (__IEEE80211_CONF_SHORT_SLOT_TIME())



struct ieee80211_ht_conf {

	bool enabled;

	enum nl80211_channel_type channel_type;

};

net/mac80211/ht.c

+1 −2
Original line number Diff line number Diff line
@@ -130,11 +130,10 @@ u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata, 
		}

	}



	ht_changed = local->hw.conf.ht.enabled != enable_ht ||

	ht_changed = conf_is_ht(&local->hw.conf) != enable_ht ||

		     channel_type != local->hw.conf.ht.channel_type;



	local->oper_channel_type = channel_type;

	local->hw.conf.ht.enabled = enable_ht;



	if (ht_changed)

		ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_HT);

net/mac80211/main.c

+0 −10
Original line number Diff line number Diff line
@@ -211,16 +211,6 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) 
	    channel_type != local->hw.conf.ht.channel_type) {

		local->hw.conf.channel = chan;

		local->hw.conf.ht.channel_type = channel_type;

		switch (channel_type) {

		case NL80211_CHAN_NO_HT:

			local->hw.conf.ht.enabled = false;

			break;

		case NL80211_CHAN_HT20:

		case NL80211_CHAN_HT40MINUS:

		case NL80211_CHAN_HT40PLUS:

			local->hw.conf.ht.enabled = true;

			break;

		}

		changed |= IEEE80211_CONF_CHANGE_CHANNEL;

	}

net/mac80211/mlme.c

+0 −1
Original line number Diff line number Diff line
@@ -901,7 +901,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 


	rcu_read_unlock();



	local->hw.conf.ht.enabled = false;

	local->oper_channel_type = NL80211_CHAN_NO_HT;

	config_changed |= IEEE80211_CONF_CHANGE_HT;