diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-10 09:12:52 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-10 09:12:52 -0700 |
| commit | 16573e7cb5ad6f94f1fd41153dfdf2aef85fe310 (patch) | |
| tree | ed13f780cb94cb10ea289d3cfbbb2b5d68fdfd42 /include | |
| parent | c77fb07fae36a02c382b729f856d45dade88a581 (diff) | |
| parent | ba6ff70a3bb76c1ff440d3a0044b82e97abb648f (diff) | |
| download | linux-16573e7cb5ad6f94f1fd41153dfdf2aef85fe310.tar.bz2 | |
Merge tag 'mac80211-next-for-net-next-2020-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
A handful of changes:
* fixes for the recent S1G work
* a docbook build time improvement
* API to pass beacon rate to lower-level driver
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/mac80211.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 4747d446179a..e8e295dae744 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -628,6 +628,8 @@ struct ieee80211_fils_discovery { * @unsol_bcast_probe_resp_interval: Unsolicited broadcast probe response * interval. * @s1g: BSS is S1G BSS (affects Association Request format). + * @beacon_tx_rate: The configured beacon transmit rate that needs to be passed + * to driver when rate control is offloaded to firmware. */ struct ieee80211_bss_conf { const u8 *bssid; @@ -698,6 +700,7 @@ struct ieee80211_bss_conf { struct ieee80211_fils_discovery fils_discovery; u32 unsol_bcast_probe_resp_interval; bool s1g; + struct cfg80211_bitrate_mask beacon_tx_rate; }; /** |