Hi, Sorry - I accumulated more stuff than I'd like due to various other competing priorities... Please pull and let me know if there's any problem. Thanks, johannes The following changes since commit 49573ff7830b1186011f5f2e9c08935ec5fc39b6: Merge branch 'tls-splice_read-fixes' (2021-11-25 19:28:21 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git tags/mac80211-for-net-2021-12-14 for you to fetch changes up to 13dee10b30c058ee2c58c5da00339cc0d4201aa6: mac80211: do drv_reconfig_complete() before restarting all (2021-12-14 11:22:20 +0100) ---------------------------------------------------------------- A fairly large number of fixes this time: * fix a station info memory leak on insert collisions * a rate control fix for retransmissions * two aggregation setup fixes * reload current regdomain when reloading database * a locking fix in regulatory work * a probe request allocation size fix in mac80211 * apply TCP vs. aggregation (sk pacing) on mesh * fix ordering of channel context update vs. station state * set up skb->dev for mesh forwarding properly * track QoS data frames only for admission control to avoid out-of-bounds read (found by syzbot) * validate extended element ID vs. existing data to avoid out-of-bounds read (found by syzbot) * fix locking in mac80211 aggregation TX setup * fix traffic stall after HW restart when TXQs are used * fix ordering of reconfig/restart after HW restart * fix interface type for extended aggregation capability lookup ---------------------------------------------------------------- Ahmed Zaki (1): mac80211: fix a memory leak where sta_info is not freed Felix Fietkau (3): mac80211: fix rate control for retransmitted frames mac80211: fix regression in SSN handling of addba tx mac80211: send ADDBA requests using the tid/queue of the aggregation session Finn Behrens (2): nl80211: reset regdom when reloading regdb nl80211: remove reload flag from regulatory_request Ilan Peer (2): cfg80211: Acquire wiphy mutex on regulatory work mac80211: Fix the size used for building probe request Johannes Berg (7): mac80211: track only QoS data frames for admission control mac80211: add docs for ssn in struct tid_ampdu_tx mac80211: agg-tx: don't schedule_and_wake_txq() under sta->lock mac80211: validate extended element ID is present mac80211: fix lookup when adding AddBA extension element mac80211: mark TX-during-stop for TX in in_reconfig mac80211: do drv_reconfig_complete() before restarting all Maxime Bizon (1): mac80211: fix TCP performance on mesh interface Mordechay Goodstein (1): mac80211: update channel context before station state Xing Song (1): mac80211: set up the fwd_skb->dev for mesh forwarding net/mac80211/agg-rx.c | 5 +++-- net/mac80211/agg-tx.c | 16 +++++++++++----- net/mac80211/driver-ops.h | 5 ++++- net/mac80211/mlme.c | 13 ++++++++++--- net/mac80211/rx.c | 1 + net/mac80211/sta_info.c | 21 ++++++++++++--------- net/mac80211/sta_info.h | 2 ++ net/mac80211/tx.c | 10 +++++----- net/mac80211/util.c | 23 ++++++++++++++--------- net/wireless/reg.c | 30 ++++++++++++++++++++++++++++-- 10 files changed, 90 insertions(+), 36 deletions(-)