pull-request: mac80211-next 2012-07-17

pull-request: mac80211-next 2012-07-17

[Johannes Berg]

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

John,

Please pull my mac80211-next tree.

I've included a number of fixes for work that went into the tree before,
in particular for the cfg80211 channel tracking again. I've also
included Luis's regulatory certification series.

Thanks!

johannes



The following changes since commit 685fb72b63faf09a767cc28332545f5830b91be8:

  mac80211: iterate the virtual monitor interface (2012-07-12 12:10:50 +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 88bc40e8c3d3bca7d26c756bb0b823d4abad3355:

  mac80211: go out of PS before sending disassoc (2012-07-17 12:17:42 +0200)

----------------------------------------------------------------
Alan Cox (1):
      mac80211: fix use after free

Eliad Peller (1):
      mac80211: go out of PS before sending disassoc

Felix Fietkau (1):
      cfg80211: ignore channel state for stopped AP/mesh interfaces

Johannes Berg (5):
      nl80211: allow enabling WoWLAN without triggers
      Revert "mac80211: refactor virtual monitor code"
      cfg80211/mac80211: re-add get_channel operation
      cfg80211: reduce monitor interface tracking
      nl80211: add wdev ID as u64 as it should

Kalle Valo (1):
      cfg80211: fix set_regdom() to cancel requests with same alpha2

Luis R. Rodriguez (5):
      cfg80211: add CONFIG_CFG80211_CERTIFICATION_ONUS
      cfg80211: add cellular base station regulatory hint support
      cfg80211: rename reg_device_remove() to wiphy_regulatory_deregister()
      cfg80211: make regulatory_update() static
      cfg80211: remove regulatory_update()

Nicolas Cavallari (1):
      mac80211: fix tx-mgmt cookie value being left uninitialized

Thomas Huehn (1):
      mac80211_hwsim: fix race condition with sta/vif pointers

Thomas Pedersen (1):
      cfg80211: support TX error rate CQM

 drivers/net/wireless/mac80211_hwsim.c |    5 --
 include/linux/nl80211.h               |   48 ++++++++++
 include/net/cfg80211.h                |   32 ++++++-
 include/net/regulatory.h              |    5 ++
 net/mac80211/cfg.c                    |   13 +--
 net/mac80211/ieee80211_i.h            |    4 -
 net/mac80211/iface.c                  |   16 +++-
 net/mac80211/mlme.c                   |   17 ++--
 net/mac80211/offchannel.c             |    6 +-
 net/wireless/Kconfig                  |   21 +++++
 net/wireless/chan.c                   |   20 ++---
 net/wireless/core.c                   |   58 ++----------
 net/wireless/core.h                   |    3 -
 net/wireless/mlme.c                   |   13 +++
 net/wireless/nl80211.c                |  156 ++++++++++++++++++++++++++++-----
 net/wireless/nl80211.h                |    5 ++
 net/wireless/reg.c                    |  130 +++++++++++++++++++++++----
 net/wireless/reg.h                    |    8 +-
 net/wireless/wext-compat.c            |    9 +-
 19 files changed, 432 insertions(+), 137 deletions(-)


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