UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2022-09-02 16:12:34 +02:00
parent 86e74a08fe
commit 774e00c20c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/mac80211/ieee80211_i.h
View File

@ -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_vht_operation *oper,
const struct ieee80211_ht_operation *htop, const struct ieee80211_ht_operation *htop,
struct cfg80211_chan_def *chandef); struct cfg80211_chan_def *chandef);
void ieee80211_chandef_eht_oper(struct ieee80211_sub_if_data *sdata, void ieee80211_chandef_eht_oper(const struct ieee80211_eht_operation *eht_oper,
const struct ieee80211_eht_operation *eht_oper,
bool support_160, bool support_320, bool support_160, bool support_320,
struct cfg80211_chan_def *chandef); struct cfg80211_chan_def *chandef);
bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata, bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,

2
net/mac80211/mlme.c
View File

@ -314,7 +314,7 @@ ieee80211_determine_chantype(struct ieee80211_sub_if_data *sdata,
if (eht_oper && (eht_oper->params & IEEE80211_EHT_OPER_INFO_PRESENT)) { if (eht_oper && (eht_oper->params & IEEE80211_EHT_OPER_INFO_PRESENT)) {
struct cfg80211_chan_def eht_chandef = *chandef; struct cfg80211_chan_def eht_chandef = *chandef;
ieee80211_chandef_eht_oper(sdata, eht_oper, ieee80211_chandef_eht_oper(eht_oper,
eht_chandef.width == eht_chandef.width ==
NL80211_CHAN_WIDTH_160, NL80211_CHAN_WIDTH_160,
false, &eht_chandef); false, &eht_chandef);

5
net/mac80211/util.c
View File

@ -3512,8 +3512,7 @@ bool ieee80211_chandef_vht_oper(struct ieee80211_hw *hw, u32 vht_cap_info,
return true; return true;
} }
void ieee80211_chandef_eht_oper(struct ieee80211_sub_if_data *sdata, void ieee80211_chandef_eht_oper(const struct ieee80211_eht_operation *eht_oper,
const struct ieee80211_eht_operation *eht_oper,
bool support_160, bool support_320, bool support_160, bool support_320,
struct cfg80211_chan_def *chandef) struct cfg80211_chan_def *chandef)
{ {
@ -3689,7 +3688,7 @@ bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata,
support_320 = support_320 =
eht_phy_cap & IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ; 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); support_320, &he_chandef);
} }