wifi: mac80211: remove unneeded parameters
ieee80211_find_80211h_pwr_constr and ieee80211_find_cisco_dtpc don't need the pointer to struct ieee80211_sub_if_data *sdata. Remove it and it'll be one step closer to handle the power constraints per-link. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com> Link: https://patch.msgid.link/20241007144851.3ea505cd74e7.Id416127544afd80e4fe7b275b612aef511fc64ed@changeid Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
committed by
Johannes Berg
parent
e21dd758cf
commit
eea3323c43
+4
-6
@@ -2727,8 +2727,7 @@ ieee80211_mgd_update_bss_param_ch_cnt(struct ieee80211_sub_if_data *sdata,
|
||||
}
|
||||
|
||||
static bool
|
||||
ieee80211_find_80211h_pwr_constr(struct ieee80211_sub_if_data *sdata,
|
||||
struct ieee80211_channel *channel,
|
||||
ieee80211_find_80211h_pwr_constr(struct ieee80211_channel *channel,
|
||||
const u8 *country_ie, u8 country_ie_len,
|
||||
const u8 *pwr_constr_elem,
|
||||
int *chan_pwr, int *pwr_reduction)
|
||||
@@ -2798,8 +2797,7 @@ ieee80211_find_80211h_pwr_constr(struct ieee80211_sub_if_data *sdata,
|
||||
return have_chan_pwr;
|
||||
}
|
||||
|
||||
static void ieee80211_find_cisco_dtpc(struct ieee80211_sub_if_data *sdata,
|
||||
struct ieee80211_channel *channel,
|
||||
static void ieee80211_find_cisco_dtpc(struct ieee80211_channel *channel,
|
||||
const u8 *cisco_dtpc_ie,
|
||||
int *pwr_level)
|
||||
{
|
||||
@@ -2833,7 +2831,7 @@ static u64 ieee80211_handle_pwr_constr(struct ieee80211_link_data *link,
|
||||
(capab & cpu_to_le16(WLAN_CAPABILITY_SPECTRUM_MGMT) ||
|
||||
capab & cpu_to_le16(WLAN_CAPABILITY_RADIO_MEASURE))) {
|
||||
has_80211h_pwr = ieee80211_find_80211h_pwr_constr(
|
||||
sdata, channel, country_ie, country_ie_len,
|
||||
channel, country_ie, country_ie_len,
|
||||
pwr_constr_ie, &chan_pwr, &pwr_reduction_80211h);
|
||||
pwr_level_80211h =
|
||||
max_t(int, 0, chan_pwr - pwr_reduction_80211h);
|
||||
@@ -2841,7 +2839,7 @@ static u64 ieee80211_handle_pwr_constr(struct ieee80211_link_data *link,
|
||||
|
||||
if (cisco_dtpc_ie) {
|
||||
ieee80211_find_cisco_dtpc(
|
||||
sdata, channel, cisco_dtpc_ie, &pwr_level_cisco);
|
||||
channel, cisco_dtpc_ie, &pwr_level_cisco);
|
||||
has_cisco_pwr = true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user