pull-request: mac80211 2013-10-14

[Johannes Berg <johannes@sipsolutions.net>]

[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]

John,

I know it's getting later in the game (rc5 is out) and my last pull
request hasn't even made it into Linus's tree, but we still have some
fixes ...

This time I have two fixes from Emmanuel for RF-kill issues, and fixed
two issues reported by Evan Huus and Thomas Lindroth respectively.

Let me know if there's any problem.

johannes

The following changes since commit 22c4ceed0184318ec5a6182c6d75d398452c2e39:

  mac80211: Run deferred scan if last roc_list item is not started (2013-09-30 12:36:56 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git for-john

for you to fetch changes up to d86aa4f8ca58898ec6a94c0635da20b948171ed7:

  mac80211: fix crash if bitrate calculation goes wrong (2013-10-14 09:47:08 +0200)

----------------------------------------------------------------
Emmanuel Grumbach (2):
      mac80211: correctly close cancelled scans
      cfg80211: don't add p2p device while in RFKILL

Johannes Berg (2):
      wireless: radiotap: fix parsing buffer overrun
      mac80211: fix crash if bitrate calculation goes wrong

 net/mac80211/ieee80211_i.h |  3 +++
 net/mac80211/scan.c        | 19 +++++++++++++++++++
 net/mac80211/util.c        |  4 ++++
 net/wireless/core.c        |  2 --
 net/wireless/core.h        |  3 +++
 net/wireless/radiotap.c    |  7 ++++++-
 6 files changed, 35 insertions(+), 3 deletions(-)


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]