pull-request: mac80211 2019-02-12

pull-request: mac80211 2019-02-12

[Johannes Berg]

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(-)

Re: pull-request: mac80211 2019-02-12

[David Miller]

From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 12 Feb 2019 12:51:20 +0100

> 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.

Pulled, thanks Johannes.