Commit 0b7392ee authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: mac80211: __ieee80211_recalc_txpower receives a link 



Handle the tx power per-link. Don't change the behavior for now. Just
change the signature of the function.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241007144851.3c9cd0731f5b.I6ebfd9d5084f3602b55c55e2669881fd92471c2f@changeid


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

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ void ieee80211_sdata_stop(struct ieee80211_sub_if_data *sdata); 
int ieee80211_add_virtual_monitor(struct ieee80211_local *local);

void ieee80211_del_virtual_monitor(struct ieee80211_local *local);



bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata);

bool __ieee80211_recalc_txpower(struct ieee80211_link_data *link);

void ieee80211_recalc_txpower(struct ieee80211_link_data *link,

			      bool update_bss);

void ieee80211_recalc_offload(struct ieee80211_local *local);

net/mac80211/iface.c

+3 −2
Original line number Diff line number Diff line
@@ -44,8 +44,9 @@ 


static void ieee80211_iface_work(struct wiphy *wiphy, struct wiphy_work *work);



bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata)

bool __ieee80211_recalc_txpower(struct ieee80211_link_data *link)

{

	struct ieee80211_sub_if_data *sdata = link->sdata;

	struct ieee80211_chanctx_conf *chanctx_conf;

	int power;
@@ -77,7 +78,7 @@ bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) 
void ieee80211_recalc_txpower(struct ieee80211_link_data *link,

			      bool update_bss)

{

	if (__ieee80211_recalc_txpower(link->sdata) ||

	if (__ieee80211_recalc_txpower(link) ||

	    (update_bss && ieee80211_sdata_running(link->sdata)))

		ieee80211_link_info_change_notify(link->sdata, link,

						  BSS_CHANGED_TXPOWER);

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -2872,7 +2872,7 @@ static u64 ieee80211_handle_pwr_constr(struct ieee80211_link_data *link, 
	}



	link->ap_power_level = new_ap_level;

	if (__ieee80211_recalc_txpower(sdata))

	if (__ieee80211_recalc_txpower(link))

		return BSS_CHANGED_TXPOWER;

	return 0;

}