Skip to content

Commit 8ecc4d7

Browse files
Aditya Kumar Singhjmberg-intel
authored andcommitted
wifi: mac80211: pass proper link id for channel switch started notification
Original changes[1] posted is having proper changes. However, at the same time, there was chandef puncturing changes which had a conflict with this. While applying, two errors crept in - a) Whitespace error. b) Link ID being passed to channel switch started notifier function is 0. However proper link ID is present in the function. Fix these now. [1] https://lore.kernel.org/all/[email protected]/ Fixes: 1a96bb4 ("wifi: mac80211: start and finalize channel switch on link basis") Signed-off-by: Aditya Kumar Singh <[email protected]> Link: https://msgid.link/[email protected] Signed-off-by: Johannes Berg <[email protected]>
1 parent f7a8b10 commit 8ecc4d7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/mac80211/cfg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4017,7 +4017,7 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
40174017
goto out;
40184018
}
40194019

4020-
link_data->csa_chanreq = chanreq;
4020+
link_data->csa_chanreq = chanreq;
40214021
link_conf->csa_active = true;
40224022

40234023
if (params->block_tx &&
@@ -4028,7 +4028,7 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
40284028
}
40294029

40304030
cfg80211_ch_switch_started_notify(sdata->dev,
4031-
&link_data->csa_chanreq.oper, 0,
4031+
&link_data->csa_chanreq.oper, link_id,
40324032
params->count, params->block_tx);
40334033

40344034
if (changed) {

0 commit comments

Comments
 (0)