pull-request: mac80211-next 2013-06-03

pull-request: mac80211-next 2013-06-03

[Johannes Berg]

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

John,

Here's another small pull request for mac80211-next, I wanted to get a
few fixes out. I have more stuff pending but not sure I can get that
reviewed right away and don't want anyone waiting for the warning fix.

I have two reverts for patches I accidentally merged in via a tree I
shouldn't have merged and a the locking fix for the locking rework I
did. On top of that, Felix's active monitor implementation, a patch to
always send multicast on the CAB queue to avoid races and a small
cleanup.

johannes


The following changes since commit 6abb9cb99f33b20c2f32f18a3ae9cc7543e46edb:

  cfg80211: make WoWLAN configuration available to drivers (2013-05-27 15:10:58 +0200)

are available in the git repository at:

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

for you to fetch changes up to ed405be5cb5e8e494e8dcd83b6eb1add34dc752a:

  mac80211: fix sdata locking around __ieee80211_request_smps (2013-06-03 13:51:59 +0200)

----------------------------------------------------------------
Felix Fietkau (2):
      cfg80211: support an active monitor interface flag
      mac80211: support active monitor interfaces

Johannes Berg (5):
      cfg80211: remove cleanup_work kernel-doc
      mac80211: always send multicast on CAB queue
      Revert "iwlwifi: mvm: remove P2P_DEVICE support"
      Revert "mac80211_hwsim: remove P2P_DEVICE support"
      mac80211: fix sdata locking around __ieee80211_request_smps

 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 14 +++++++++++++-
 drivers/net/wireless/mac80211_hwsim.c       |  4 +++-
 include/net/cfg80211.h                      |  3 ++-
 include/uapi/linux/nl80211.h                |  4 ++++
 net/mac80211/cfg.c                          | 13 +++++++++----
 net/mac80211/driver-ops.h                   |  3 ++-
 net/mac80211/iface.c                        | 29 +++++++++++++++++++++++------
 net/mac80211/tx.c                           |  5 +++--
 net/mac80211/util.c                         |  6 ++++++
 net/wireless/nl80211.c                      | 10 ++++++++++
 10 files changed, 75 insertions(+), 16 deletions(-)


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

Re: pull-request: mac80211-next 2013-06-03

[John W. Linville]

On Mon, Jun 03, 2013 at 04:51:27PM +0200, Johannes Berg wrote:
> John,
> 
> Here's another small pull request for mac80211-next, I wanted to get a
> few fixes out. I have more stuff pending but not sure I can get that
> reviewed right away and don't want anyone waiting for the warning fix.
> 
> I have two reverts for patches I accidentally merged in via a tree I
> shouldn't have merged and a the locking fix for the locking rework I
> did. On top of that, Felix's active monitor implementation, a patch to
> always send multicast on the CAB queue to avoid races and a small
> cleanup.
> 
> johannes
> 
> 
> The following changes since commit 6abb9cb99f33b20c2f32f18a3ae9cc7543e46edb:
> 
>   cfg80211: make WoWLAN configuration available to drivers (2013-05-27 15:10:58 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git for-john
> 
> for you to fetch changes up to ed405be5cb5e8e494e8dcd83b6eb1add34dc752a:
> 
>   mac80211: fix sdata locking around __ieee80211_request_smps (2013-06-03 13:51:59 +0200)

Pulling now...

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