| Message ID | 20220906044812.7609-4-kieran.frewen@morsemicro.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Johannes Berg |
| Headers | show |
| Series | Additional Support for 802.11ah (S1G) | expand |
On Tue, 2022-09-06 at 16:48 +1200, Kieran Frewen wrote: > If configured, use the S1G short beacon format. The S1G short beacon > format includes a limited set of information elements. Could you be more specific? Is there really no reason to think that this limited set might need to be set partially by hostapd? > - if (beacon->tail) > + if (beacon->tail && !is_short) > skb_put_data(skb, beacon->tail, beacon->tail_len); Asking since you do this here. johannes
On Tue, 2022-09-06 at 16:48 +1200, Kieran Frewen wrote: > If configured, use the S1G short beacon format. The S1G short beacon > format includes a limited set of information elements. > > Signed-off-by: Kieran Frewen <kieran.frewen@morsemicro.com> > --- > include/net/cfg80211.h | 2 +- > include/net/mac80211.h | 1 + > net/mac80211/cfg.c | 1 + > net/mac80211/ieee80211_i.h | 1 + > net/mac80211/tx.c | 14 +++++++++++++- > 5 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h > index 945e7700de66..b750b2ad246b 100644 > --- a/include/net/cfg80211.h > +++ b/include/net/cfg80211.h > @@ -1328,7 +1328,7 @@ struct cfg80211_ap_settings { > > struct cfg80211_beacon_data beacon; > > - int beacon_interval, dtim_period; > + int beacon_interval, dtim_period, short_beacon_period; > One way or the other, this doesn't belong into this patch - you should reorder so cfg80211 comes first and then mac80211 can use it, and then this change goes into the cfg80211 patch. johannes
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 945e7700de66..b750b2ad246b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -1328,7 +1328,7 @@ struct cfg80211_ap_settings { struct cfg80211_beacon_data beacon; - int beacon_interval, dtim_period; + int beacon_interval, dtim_period, short_beacon_period; const u8 *ssid; size_t ssid_len; enum nl80211_hidden_ssid hidden_ssid; diff --git a/include/net/mac80211.h b/include/net/mac80211.h index f198af600b5e..359edfa9ec1c 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -672,6 +672,7 @@ struct ieee80211_bss_conf { bool enable_beacon; u8 dtim_period; u16 beacon_int; + u8 short_beacon_period; u16 assoc_capability; u64 sync_tsf; u32 sync_device_ts; diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index a4f6971b7a19..03ed90ce9a84 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -1236,6 +1236,7 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, } link_conf->dtim_period = params->dtim_period; + link_conf->short_beacon_period = params->short_beacon_period; link_conf->enable_beacon = true; link_conf->allow_p2p_go_ps = sdata->vif.p2p; link_conf->twt_responder = params->twt_responder; diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index e192e1ec0261..cd8879998739 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -267,6 +267,7 @@ struct beacon_data { struct ieee80211_meshconf_ie *meshconf; u16 cntdwn_counter_offsets[IEEE80211_MAX_CNTDWN_COUNTERS_NUM]; u8 cntdwn_current_counter; + u8 long_beacon_count; struct cfg80211_mbssid_elems *mbssid_ies; struct rcu_head rcu_head; }; diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index bf85a01fcf9d..48c737aeb3f7 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -5099,6 +5099,18 @@ ieee80211_beacon_get_ap(struct ieee80211_hw *hw, struct sk_buff *skb = NULL; u16 csa_off_base = 0; int mbssid_len; + bool is_short = false; + + if (vif->cfg.s1g) { + if (beacon->long_beacon_count == 0) { + is_short = false; + beacon->long_beacon_count = + vif->bss_conf.short_beacon_period - 1; + } else { + is_short = true; + beacon->long_beacon_count--; + } + } if (beacon->cntdwn_counter_offsets[0]) { if (!is_template) @@ -5136,7 +5148,7 @@ ieee80211_beacon_get_ap(struct ieee80211_hw *hw, csa_off_base = skb->len; } - if (beacon->tail) + if (beacon->tail && !is_short) skb_put_data(skb, beacon->tail, beacon->tail_len); if (ieee80211_beacon_protect(skb, local, sdata, link) < 0)
If configured, use the S1G short beacon format. The S1G short beacon format includes a limited set of information elements. Signed-off-by: Kieran Frewen <kieran.frewen@morsemicro.com> --- include/net/cfg80211.h | 2 +- include/net/mac80211.h | 1 + net/mac80211/cfg.c | 1 + net/mac80211/ieee80211_i.h | 1 + net/mac80211/tx.c | 14 +++++++++++++- 5 files changed, 17 insertions(+), 2 deletions(-)