Commit 774e00c2 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: remove unused arg to ieee80211_chandef_eht_oper 



We don't need the sdata argument, and it doesn't make any
sense for a direct conversion from one value to another,
so just remove the argument

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 86e74a08

net/mac80211/ieee80211_i.h

+1 −2
Original line number Diff line number Diff line
@@ -2412,8 +2412,7 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, u32 vht_cap_info, 
				const struct ieee80211_vht_operation *oper,

				const struct ieee80211_ht_operation *htop,

				struct cfg80211_chan_def *chandef);

void ieee80211_chandef_eht_oper(struct ieee80211_sub_if_data *sdata,

				const struct ieee80211_eht_operation *eht_oper,

void ieee80211_chandef_eht_oper(const struct ieee80211_eht_operation *eht_oper,

				bool support_160, bool support_320,

				struct cfg80211_chan_def *chandef);

bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata, 
	if (eht_oper && (eht_oper->params & IEEE80211_EHT_OPER_INFO_PRESENT)) {

		struct cfg80211_chan_def eht_chandef = *chandef;



		ieee80211_chandef_eht_oper(sdata, eht_oper,

		ieee80211_chandef_eht_oper(eht_oper,

					   eht_chandef.width ==

					   NL80211_CHAN_WIDTH_160,

					   false, &eht_chandef);

net/mac80211/util.c

+2 −3
Original line number Diff line number Diff line
@@ -3512,8 +3512,7 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, u32 vht_cap_info, 
	return true;

}



void ieee80211_chandef_eht_oper(struct ieee80211_sub_if_data *sdata,

				const struct ieee80211_eht_operation *eht_oper,

void ieee80211_chandef_eht_oper(const struct ieee80211_eht_operation *eht_oper,

				bool support_160, bool support_320,

				struct cfg80211_chan_def *chandef)

{
@@ -3689,7 +3688,7 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata, 
		support_320 =

			eht_phy_cap & IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ;



		ieee80211_chandef_eht_oper(sdata, eht_oper, support_160,

		ieee80211_chandef_eht_oper(eht_oper, support_160,

					   support_320, &he_chandef);

	}