Commit 7fc83a2b authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: pass link ID where already present 



In a few cases we already have the link ID in the APIs,
pass it already even if it cannot be non-zero yet.

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

net/mac80211/cfg.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -1334,7 +1334,7 @@ static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev, 
		err |= BSS_CHANGED_HE_BSS_COLOR;

		err |= BSS_CHANGED_HE_BSS_COLOR;

	}

	}





	ieee80211_link_info_change_notify(sdata, 0, err);

	ieee80211_link_info_change_notify(sdata, params->link_id, err);

	return 0;

	return 0;

}

}
@@ -1415,7 +1415,8 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev, 
	sdata->beacon_rate_set = false;

	sdata->beacon_rate_set = false;

	sdata->vif.cfg.ssid_len = 0;

	sdata->vif.cfg.ssid_len = 0;

	clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);

	clear_bit(SDATA_STATE_OFFCHANNEL_BEACON_STOPPED, &sdata->state);

	ieee80211_link_info_change_notify(sdata, 0, BSS_CHANGED_BEACON_ENABLED);

	ieee80211_link_info_change_notify(sdata, link_id,

					  BSS_CHANGED_BEACON_ENABLED);





	if (sdata->wdev.cac_started) {

	if (sdata->wdev.cac_started) {

		chandef = sdata->vif.bss_conf.chandef;

		chandef = sdata->vif.bss_conf.chandef;
@@ -3981,7 +3982,7 @@ static int ieee80211_set_ap_chanwidth(struct wiphy *wiphy, 




	ret = ieee80211_vif_change_bandwidth(sdata, chandef, &changed);

	ret = ieee80211_vif_change_bandwidth(sdata, chandef, &changed);

	if (ret == 0)

	if (ret == 0)

		ieee80211_link_info_change_notify(sdata, 0, changed);

		ieee80211_link_info_change_notify(sdata, link_id, changed);





	return ret;

	return ret;

}

}