From: Johannes Berg Date: Mon, 30 May 2022 12:18:09 +0000 (+0200) Subject: wifi: mac80211: pass link ID where already present X-Git-Tag: block-6.0-2022-08-12~31^2~132^2~85 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7fc83a2ba2d54780690d871d03d0d8e75868a803;p=linux-2.6-block.git 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: Johannes Berg --- diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index a1404fe5cfe4..69f540b0cbc6 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1334,7 +1334,7 @@ static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev, 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; } @@ -1415,7 +1415,8 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev, sdata->beacon_rate_set = false; sdata->vif.cfg.ssid_len = 0; 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) { 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); if (ret == 0) - ieee80211_link_info_change_notify(sdata, 0, changed); + ieee80211_link_info_change_notify(sdata, link_id, changed); return ret; }