John,
Please ignore the previous pull request. I've updated my branch with a
few more commits, this is the combined pull request.
I've included
* AKM definitions from Bing,
* mesh fixes from Thomas, including a fix from him for me breaking his
patch while applying,
* channel check fix from Simon,
* an old patch from Yoni Divinsky who doesn't even work for TI any
more, to configure the WEP TX key for ARP offload etc.
* MAC ACL API from Vasanth
* a fix for the infamous chanctx_conf warning from Arnd
* from myself, a fix for my previous aggregation changes, some cleanup
and some improvements and fixes for WoWLAN
Let me know if there are any problems.
Thanks,
johannes
The following changes since commit 5a32aff37a02ebc959837f08d09ac8ba65d4f1b0:
mac80211: split out chandef tracing macros (2013-01-16 23:57:51 +0100)
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 3b4797bce0050570e84bedd10e1b14e9320a3551:
mac80211: fix mesh_sta_info_get() reshuffle damage (2013-01-28 13:15:34 +0100)
----------------------------------------------------------------
Arnd Bergmann (1):
mac80211: avoid a build warning
Bing Zhao (1):
ieee80211: define AKM suite selectors type 5, 6 and 7
Emmanuel Grumbach (1):
mac80211: provide the vif in rssi_callback
Johannes Berg (5):
mac80211: remove ARP filter enable/disable logic
mac80211: improve aggregation debug messages
mac80211: allow drivers to access IPv6 information
mac80211: fix aggregation state with current drivers
mac80211: remove redundant check
Simon Wunderlich (1):
cfg80211: fix channel check in cfg80211_can_use_iftype_chan
Thomas Pedersen (3):
mac80211: clean up mesh sta allocation warning
mac80211: support mesh rate updates
mac80211: fix mesh_sta_info_get() reshuffle damage
Vasanthakumar Thiagarajan (2):
cfg80211: Move the definition of struct mac_address up
cfg80211/nl80211: add API for MAC address ACLs
Yoni Divinsky (1):
mac80211: add op to configure default key id
.../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 5 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 1 +
drivers/net/wireless/ti/wlcore/main.c | 3 +-
include/linux/ieee80211.h | 5 +-
include/net/cfg80211.h | 42 +++++-
include/net/mac80211.h | 31 +++-
include/uapi/linux/nl80211.h | 51 ++++++-
net/mac80211/agg-rx.c | 14 +-
net/mac80211/agg-tx.c | 61 +++++---
net/mac80211/driver-ops.h | 36 ++++-
net/mac80211/ieee80211_i.h | 3 +-
net/mac80211/iface.c | 3 -
net/mac80211/key.c | 5 +-
net/mac80211/main.c | 64 ++++++--
net/mac80211/mesh_plink.c | 168 +++++++++++++--------
net/mac80211/mlme.c | 42 ++----
net/mac80211/sta_info.c | 5 -
net/mac80211/trace.h | 53 ++++++-
net/mac80211/tx.c | 8 +-
net/wireless/core.c | 5 +
net/wireless/nl80211.c | 116 ++++++++++++++
net/wireless/rdev-ops.h | 12 ++
net/wireless/trace.h | 18 +++
net/wireless/util.c | 3 +-
24 files changed, 576 insertions(+), 178 deletions(-)
Attachment:
signature.asc
Description: This is a digitally signed message part
