pull-request: mac80211: 2014-05-14

[Johannes Berg <johannes@sipsolutions.net>]

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

John,

I know I sent a pull request two days ago, but now I have more fixes ...
if it's too much let me know and I'll limit myself to once a week or so,
but it seemed that we should get at least Emmanuel's fix in soon.

This has a fix from Emmanuel for a problem I failed to fix - when
association is in progress then it needs to be cancelled while
suspending (I had fixed the same for authentication). Also included a
fix from myself for a userspace API problem that hit the iw tool and a
fix to the remain-on-channel framework.

Let me know if there's any problem.

johannes

The following changes since commit f9ac71bfcc5c937ff02765dc316cf5bc01d21d97:

  mac80211: fix vif name tracing (2014-05-09 14:35:40 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git HEAD

for you to fetch changes up to b4b177a5556a686909e643f1e9b6434c10de079f:

  mac80211: fix on-channel remain-on-channel (2014-05-14 15:48:38 +0200)

----------------------------------------------------------------
Emmanuel Grumbach (1):
      mac80211: fix suspend vs. association race

Johannes Berg (2):
      nl80211: fix NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL API
      mac80211: fix on-channel remain-on-channel

 include/uapi/linux/nl80211.h |  4 +++-
 net/mac80211/ieee80211_i.h   |  1 +
 net/mac80211/mlme.c          | 20 +++++++++++++-------
 net/mac80211/offchannel.c    | 27 ++++++++++++++++++++-------
 4 files changed, 37 insertions(+), 15 deletions(-)


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