system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-19 18:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

wifi: mac80211: fix channel switch link data

Browse source 
Use the correct link ID and per-link puncturing data instead
of hardcoding link ID 0 and using deflink puncturing.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230827135854.0b6a211c8e75.I5724d32bb2dae440888efbc47334d8c115db9d50@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2023-08-27 14:05:32 +03:00
parent 563fe446ef
commit 86a8db67a1
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/mac80211/cfg.c
View file

@ -3618,7 +3618,7 @@ static int __ieee80211_csa_finalize(struct ieee80211_link_data *link_data)
return ieee80211_link_use_reserved_context(&sdata->deflink);
}
if (!cfg80211_chandef_identical(&sdata->vif.bss_conf.chandef,
if (!cfg80211_chandef_identical(&link_data->conf->chandef,
&link_data->csa_chandef))
return -EINVAL;
@ -3634,7 +3634,7 @@ static int __ieee80211_csa_finalize(struct ieee80211_link_data *link_data)
changed |= BSS_CHANGED_EHT_PUNCTURING;
}
ieee80211_link_info_change_notify(sdata, &sdata->deflink, changed);
ieee80211_link_info_change_notify(sdata, link_data, changed);
if (link_data->csa_block_tx) {
ieee80211_wake_vif_queues(local, sdata,
@ -3646,8 +3646,9 @@ static int __ieee80211_csa_finalize(struct ieee80211_link_data *link_data)
if (err)
return err;
cfg80211_ch_switch_notify(sdata->dev, &link_data->csa_chandef, 0,
sdata->vif.bss_conf.eht_puncturing);
cfg80211_ch_switch_notify(sdata->dev, &link_data->csa_chandef,
link_data->link_id,
link_data->conf->eht_puncturing);
return 0;
}

3
net/mac80211/mlme.c
View file

@ -1772,7 +1772,8 @@ static void ieee80211_chswitch_post_beacon(struct ieee80211_link_data *link)
return;
}
cfg80211_ch_switch_notify(sdata->dev, &link->reserved_chandef, 0, 0);
cfg80211_ch_switch_notify(sdata->dev, &link->reserved_chandef,
link->link_id, 0);
}
void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success,