]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wifi: mac80211: pass proper link id for channel switch started notification
authorAditya Kumar Singh <quic_adisi@quicinc.com>
Thu, 9 May 2024 03:25:55 +0000 (08:55 +0530)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 29 May 2024 13:25:36 +0000 (15:25 +0200)
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/20240130140918.1172387-5-quic_adisi@quicinc.com/

Fixes: 1a96bb4e8a79 ("wifi: mac80211: start and finalize channel switch on link basis")
Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Link: https://msgid.link/20240509032555.263933-1-quic_adisi@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c

index 99abbb9e8477bdc5c8cf56af92b257e956fbcbaa..83ad6c9709fe609414dc2a9a3519fc943293a2c5 100644 (file)
@@ -4017,7 +4017,7 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
                goto out;
        }
 
-       link_data->csa_chanreq = chanreq; 
+       link_data->csa_chanreq = chanreq;
        link_conf->csa_active = true;
 
        if (params->block_tx &&
@@ -4028,7 +4028,7 @@ __ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
        }
 
        cfg80211_ch_switch_started_notify(sdata->dev,
-                                         &link_data->csa_chanreq.oper, 0,
+                                         &link_data->csa_chanreq.oper, link_id,
                                          params->count, params->block_tx);
 
        if (changed) {