pull-request: mac80211 2014-02-06

pull-request: mac80211 2014-02-06

[Johannes Berg]

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

Hi John,

First round of fixes ...

This is just a collection of small fixes, the commit logs explain the
details. The only thing that isn't strictly a fix is the 5/10 MHz
enabling, I had forgotten this and there's little point in waiting
longer. The patch simply removes the force-disable code that I put in
when there was a problem with the userspace API (that has long been
fixed.)

Please pull.

johannes



The following changes since commit 53d8ab29f8f6d67e37857b68189b38fa3d87dd8e:

  Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block (2014-01-30 11:40:10 -0800)

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 fab57a6cc227468ca9e6a4c7ff8d3b10727785ee:

  mac80211: fix virtual monitor interface iteration (2014-02-06 09:55:22 +0100)

----------------------------------------------------------------
Eliad Peller (1):
      mac80211: move roc cookie assignment earlier

Emmanuel Grumbach (2):
      mac80211: avoid deadlock revealed by lockdep
      mac80211: release the channel in error path in start_ap

Johannes Berg (5):
      cfg80211: re-enable 5/10 MHz support
      cfg80211: fix scan done race
      cfg80211: send scan results from work queue
      mac80211: fix fragmentation code, particularly for encryption
      mac80211: fix virtual monitor interface iteration

Pontus Fuchs (1):
      nl80211: Reset split_start when netlink skb is exhausted

Sujith Manoharan (1):
      mac80211: Fix IBSS disconnect

 net/mac80211/cfg.c     | 44 +++++++++++++++++++++++---------------------
 net/mac80211/ht.c      |  4 +++-
 net/mac80211/ibss.c    |  5 +----
 net/mac80211/iface.c   | 27 +++++++++++++++++++--------
 net/mac80211/tx.c      |  2 +-
 net/wireless/core.c    | 17 ++++++++++-------
 net/wireless/core.h    |  4 +++-
 net/wireless/nl80211.c | 32 ++++++++++++--------------------
 net/wireless/nl80211.h |  8 ++++----
 net/wireless/scan.c    | 40 +++++++++++++++++++++++++---------------
 net/wireless/sme.c     |  2 +-
 11 files changed, 102 insertions(+), 83 deletions(-)


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

Re: pull-request: mac80211 2014-02-06

[John W. Linville]

On Thu, Feb 06, 2014 at 10:00:37AM +0100, Johannes Berg wrote:
> Hi John,
> 
> First round of fixes ...
> 
> This is just a collection of small fixes, the commit logs explain the
> details. The only thing that isn't strictly a fix is the 5/10 MHz
> enabling, I had forgotten this and there's little point in waiting
> longer. The patch simply removes the force-disable code that I put in
> when there was a problem with the userspace API (that has long been
> fixed.)
> 
> Please pull.
> 
> johannes
> 
> 
> 
> The following changes since commit 53d8ab29f8f6d67e37857b68189b38fa3d87dd8e:
> 
>   Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block (2014-01-30 11:40:10 -0800)
> 
> 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 fab57a6cc227468ca9e6a4c7ff8d3b10727785ee:
> 
>   mac80211: fix virtual monitor interface iteration (2014-02-06 09:55:22 +0100)

Pulling now...

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.