From: Johannes Berg <johannes@sipsolutions.net>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: pull-request: mac80211 2019-02-12
Date: Tue, 12 Feb 2019 12:51:20 +0100 [thread overview]
Message-ID: <20190212115121.27086-1-johannes@sipsolutions.net> (raw)
Hi Dave,
We have few more fixes, mostly one-liners; two are bigger:
* the speculation one, only because the function had multiple
return points and that had to change, and
* the peer measurement locking one, because I had to refactor
a function to be able to call it with or without locking
(depending on context).
Please pull and let me know if there's any problem.
Thanks,
johannes
The following changes since commit f09bef61f1ed72869b231e5cff16e73a06505cfb:
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (2019-02-05 11:23:23 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git tags/mac80211-for-davem-2019-02-12
for you to fetch changes up to 6157ca0d6bfe437691b1e98a62e2efe12b6714da:
mac80211: Fix Tx aggregation session tear down with ITXQs (2019-02-11 15:50:56 +0100)
----------------------------------------------------------------
Just a few fixes:
* aggregation session teardown with internal TXQs was
continuing to send some frames marked as aggregation,
fix from Ilan
* IBSS join was missed during firmware restart, should
such a thing happen
* speculative execution based on the return value of
cfg80211_classify8021d() - which is controlled by the
sender of the packet - could be problematic in some
code using it, prevent it
* a few peer measurement fixes
----------------------------------------------------------------
Aviya Erenfeld (1):
nl80211: Fix FTM per burst maximum value
Ilan Peer (1):
mac80211: Fix Tx aggregation session tear down with ITXQs
Johannes Berg (5):
cfg80211: pmsr: fix MAC address setting
cfg80211: pmsr: fix abort locking
mac80211: call drv_ibss_join() on restart
cfg80211: pmsr: record netlink port ID
cfg80211: prevent speculation on cfg80211_classify8021d() return
net/mac80211/agg-tx.c | 4 +++-
net/mac80211/util.c | 6 +++++-
net/wireless/core.c | 2 ++
net/wireless/nl80211.c | 2 +-
net/wireless/pmsr.c | 26 +++++++++++++++++---------
net/wireless/util.c | 35 ++++++++++++++++++++++++-----------
6 files changed, 52 insertions(+), 23 deletions(-)
next reply other threads:[~2019-02-12 11:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-12 11:51 Johannes Berg [this message]
2019-02-12 16:43 ` pull-request: mac80211 2019-02-12 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190212115121.27086-1-johannes@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=davem@davemloft.net \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox