| Message ID | 20240129052832.905113-3-quic_adisi@quicinc.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | wifi: cfg80211/mac80211: add link_id handling in AP channel switch during Multi-Link Operation | expand |
On 1/28/2024 9:28 PM, Aditya Kumar Singh wrote: > diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c > index 68a48abc7287..504db497df06 100644 > --- a/net/mac80211/tx.c > +++ b/net/mac80211/tx.c > @@ -5030,16 +5030,24 @@ static u8 __ieee80211_beacon_update_cntdwn(struct beacon_data *beacon) > return beacon->cntdwn_current_counter; > } > > -u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif) > +u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif, unsigned int link_id) > { > struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); > + struct ieee80211_link_data *link; > struct beacon_data *beacon = NULL; > u8 count = 0; > > + if (WARN_ON(link_id > IEEE80211_MLD_MAX_NUM_LINKS)) shouldn't this be >= ? aren't the arrays size [IEEE80211_MLD_MAX_NUM_LINKS] and hence indexes must be 0..IEEE80211_MLD_MAX_NUM_LINKS-1? > + return 0; > + > rcu_read_lock(); > > + link = rcu_dereference(sdata->link[link_id]); > + if (!link) > + goto unlock; > + > if (sdata->vif.type == NL80211_IFTYPE_AP) > - beacon = rcu_dereference(sdata->deflink.u.ap.beacon); > + beacon = rcu_dereference(link->u.ap.beacon); > else if (sdata->vif.type == NL80211_IFTYPE_ADHOC) > beacon = rcu_dereference(sdata->u.ibss.presp); > else if (ieee80211_vif_is_mesh(&sdata->vif))
On 1/30/24 06:53, Jeff Johnson wrote: > On 1/28/2024 9:28 PM, Aditya Kumar Singh wrote: >> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c >> index 68a48abc7287..504db497df06 100644 >> --- a/net/mac80211/tx.c >> +++ b/net/mac80211/tx.c >> @@ -5030,16 +5030,24 @@ static u8 __ieee80211_beacon_update_cntdwn(struct beacon_data *beacon) >> return beacon->cntdwn_current_counter; >> } >> >> -u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif) >> +u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif, unsigned int link_id) >> { >> struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); >> + struct ieee80211_link_data *link; >> struct beacon_data *beacon = NULL; >> u8 count = 0; >> >> + if (WARN_ON(link_id > IEEE80211_MLD_MAX_NUM_LINKS)) > > shouldn't this be >= ? > > aren't the arrays size [IEEE80211_MLD_MAX_NUM_LINKS] and hence indexes > must be 0..IEEE80211_MLD_MAX_NUM_LINKS-1? Yes correct it should be >=. My bad. Will rectify in net version. Thanks for pointing it out. > >> + return 0; >> + >> rcu_read_lock(); >> >> + link = rcu_dereference(sdata->link[link_id]); >> + if (!link) >> + goto unlock; >> + >> if (sdata->vif.type == NL80211_IFTYPE_AP) >> - beacon = rcu_dereference(sdata->deflink.u.ap.beacon); >> + beacon = rcu_dereference(link->u.ap.beacon); >> else if (sdata->vif.type == NL80211_IFTYPE_ADHOC) >> beacon = rcu_dereference(sdata->u.ibss.presp); >> else if (ieee80211_vif_is_mesh(&sdata->vif))
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 090bcf148d0c..e32e8c70986d 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -2035,7 +2035,7 @@ static void ath10k_mac_vif_ap_csa_count_down(struct ath10k_vif *arvif) return; if (!ieee80211_beacon_cntdwn_is_complete(vif)) { - ieee80211_beacon_update_cntdwn(vif); + ieee80211_beacon_update_cntdwn(vif, 0); ret = ath10k_mac_setup_bcn_tmpl(arvif); if (ret) diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index b13525bbbb80..0ea2ae40f2ad 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -1589,7 +1589,7 @@ void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif) arvif->bcca_zero_sent = false; if (vif->bss_conf.color_change_active) - ieee80211_beacon_update_cntdwn(vif); + ieee80211_beacon_update_cntdwn(vif, 0); ath11k_mac_setup_bcn_tmpl(arvif); } diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c index c4f96125cf33..581c2d3fc534 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c @@ -1467,7 +1467,7 @@ static void iwl_mvm_csa_count_down(struct iwl_mvm *mvm, mvmvif->csa_countdown = true; if (!ieee80211_beacon_cntdwn_is_complete(csa_vif)) { - int c = ieee80211_beacon_update_cntdwn(csa_vif); + int c = ieee80211_beacon_update_cntdwn(csa_vif, 0); iwl_mvm_mac_ctxt_beacon_changed(mvm, csa_vif, &csa_vif->bss_conf); diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 8d6ae22c09bf..ad70dea96a46 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -5507,6 +5507,7 @@ static inline struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, /** * ieee80211_beacon_update_cntdwn - request mac80211 to decrement the beacon countdown * @vif: &struct ieee80211_vif pointer from the add_interface callback. + * @link_id: valid link_id during MLO or 0 for non-MLO * * The beacon counter should be updated after each beacon transmission. * This function is called implicitly when @@ -5516,7 +5517,8 @@ static inline struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw, * * Return: new countdown value */ -u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif); +u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif, + unsigned int link_id); /** * ieee80211_beacon_set_cntdwn - request mac80211 to set beacon countdown diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 68a48abc7287..504db497df06 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -5030,16 +5030,24 @@ static u8 __ieee80211_beacon_update_cntdwn(struct beacon_data *beacon) return beacon->cntdwn_current_counter; } -u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif) +u8 ieee80211_beacon_update_cntdwn(struct ieee80211_vif *vif, unsigned int link_id) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); + struct ieee80211_link_data *link; struct beacon_data *beacon = NULL; u8 count = 0; + if (WARN_ON(link_id > IEEE80211_MLD_MAX_NUM_LINKS)) + return 0; + rcu_read_lock(); + link = rcu_dereference(sdata->link[link_id]); + if (!link) + goto unlock; + if (sdata->vif.type == NL80211_IFTYPE_AP) - beacon = rcu_dereference(sdata->deflink.u.ap.beacon); + beacon = rcu_dereference(link->u.ap.beacon); else if (sdata->vif.type == NL80211_IFTYPE_ADHOC) beacon = rcu_dereference(sdata->u.ibss.presp); else if (ieee80211_vif_is_mesh(&sdata->vif)) @@ -5280,7 +5288,7 @@ ieee80211_beacon_get_ap(struct ieee80211_hw *hw, if (beacon->cntdwn_counter_offsets[0]) { if (!is_template) - ieee80211_beacon_update_cntdwn(vif); + ieee80211_beacon_update_cntdwn(vif, link->link_id); ieee80211_set_beacon_cntdwn(sdata, beacon, link); }
Currently, function to update beacon counter uses deflink to fetch the beacon and then update the counter. However, with MLO, there is a need to update the counter for the beacon in a particular link. Add support to use link_id in order to fetch the beacon from a particular link data during beacon update counter. Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com> --- drivers/net/wireless/ath/ath10k/mac.c | 2 +- drivers/net/wireless/ath/ath11k/mac.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- include/net/mac80211.h | 4 +++- net/mac80211/tx.c | 14 +++++++++++--- 5 files changed, 17 insertions(+), 7 deletions(-)