John,
Please pull as below. Note that ra.kernel.org wasn't responding to my
push this morning so I've pushed to my git.sipsolutions.net tree
instead, if ra.kernel.org recovers you should find the same contents
there in my mac80211-next tree as well.
I've included
* a few fixes for the new remain-on-channel framework
* a fix from Felix for a regression due to the new channel handling
* a bunch of mesh improvements/features from the Chun-Yeow
* the IBSS auth frame handling patches from Will Hawkins to enable
handling them in userspace for SAE
* some refactoring I did myself in nl80211 that paves the way for
having non-netdev virtual wireless devices
as well as a bunch of other small improvements all over the place.
johannes
The following changes since commit 934b9d1ed71cca5a220ec13e3f76d6aebf5183da:
wl18xx: avoid some -Wformat warnings (2012-06-08 14:24:53 -0400)
are available in the git repository at:
git://git.sipsolutions.net/mac80211-next.git for-john
for you to fetch changes up to 0f6b3f597daab2254614e2773e322e73fb1b6f4b:
mac80211: fix double-start of remain-on-channel (2012-06-20 20:12:12 +0200)
----------------------------------------------------------------
Arik Nemtsov (2):
mac80211: stop Rx during HW reconfig
mac80211: set only VO as a U-APSD enabled AC
Avinash Patil (1):
ieee80211: definitions for Microsoft Vendor OUI and WPA OUI type
Chun-Yeow Yeoh (9):
cfg80211: add missing kernel-doc for mesh configuration structure
{nl,cfg,mac}80211: fix the coding style related to mesh parameters
{nl,cfg,mac}80211: implement dot11MeshHWMProotInterval and dot11MeshHWMPactivePathToRootTimeout
mac80211: implement the proactive PREQ generation
mac80211: implement the proactive PREP generation
mac80211: invoke the timer only with correct dot11MeshHWMPRootMode value
{nl,cfg,mac}80211: implement dot11MeshHWMPconfirmationInterval
mac80211: fix the assignment of mesh element TTL
mac80211: fix and improve mesh RANN processing
Eyal Shapira (1):
mac80211: fix cleanup if driver suspend callback fails
Felix Fietkau (1):
cfg80211: fix regression in multi-vif AP start
Javier Cardona (2):
mac80211: Remove unused variable
mac80211: Rename stainfo variable for the more common sta
Johannes Berg (10):
mac80211: remove unneeded ieee80211_run_deferred_scan()
mac80211: allow cancelling dependent ROCs
nl80211: fix sched scan match attribute name
cfg80211/nl80211: fix kernel-doc
cfg80211: make some functions static
nl80211: refactor __cfg80211_rdev_from_info
nl80211: fix netns separation
nl80211: change __cfg80211_rdev_from_info
nl80211: use __cfg80211_rdev_from_attrs for testmode
mac80211: fix double-start of remain-on-channel
Luciano Coelho (2):
mac80211: initialize sta pointer to avoid false-positive warning
mac80211: use the correct capability info in ieee80211_set_associated()
Pontus Fuchs (1):
mac80211: Disallow changing chan type on monitor when CHAN_MODE_FIXED
Rajkumar Manoharan (1):
mac80211: cleanup offchannel_ps_enable argument
Will Hawkins (3):
mac80211: Track auth frame registrations on IBSS ifaces
mac80211: send auth in IBSS only if userspace isn't handling it
mac80211: Allow userspace to register for auth frames in IBSS
Yoni Divinsky (1):
mac80211: save wmm_acm per sdata
include/linux/ieee80211.h | 50 +++++++-
include/linux/nl80211.h | 150 ++++++++++++++--------
include/net/cfg80211.h | 92 +++++++++++---
net/mac80211/cfg.c | 75 ++++++++---
net/mac80211/debugfs_netdev.c | 43 ++++---
net/mac80211/ibss.c | 2 +-
net/mac80211/ieee80211_i.h | 19 ++-
net/mac80211/iface.c | 2 +-
net/mac80211/main.c | 11 +-
net/mac80211/mesh.c | 12 +-
net/mac80211/mesh.h | 4 +-
net/mac80211/mesh_hwmp.c | 126 ++++++++++++++-----
net/mac80211/mlme.c | 16 +--
net/mac80211/offchannel.c | 20 ++-
net/mac80211/pm.c | 10 ++
net/mac80211/rx.c | 6 +-
net/mac80211/util.c | 3 +
net/mac80211/wme.c | 11 +-
net/mac80211/wme.h | 2 +-
net/wireless/core.c | 63 ----------
net/wireless/core.h | 26 ----
net/wireless/mesh.c | 6 +
net/wireless/nl80211.c | 273 +++++++++++++++++++++++++++++++----------
23 files changed, 688 insertions(+), 334 deletions(-)
Attachment:
signature.asc
Description: This is a digitally signed message part
