John,
Please pull as below. I'm including various small patches and my
debugging cleanups, including optional debug tracing.
johannes
The following changes since commit 0f6b3f597daab2254614e2773e322e73fb1b6f4b:
mac80211: fix double-start of remain-on-channel (2012-06-20 20:12:12 +0200)
are available in the git repository at:
git://git.sipsolutions.net/mac80211-next.git for-john
for you to fetch changes up to 371a255e863857f988a91a3850d6feeaa4f3c536:
mac80211: make ieee80211_check_concurrent_iface netdev-independent (2012-06-26 09:37:25 +0200)
----------------------------------------------------------------
Avinash Patil (1):
ieee80211: more OUI type definitions for WLAN_OUI_MICROSOFT
Johannes Berg (9):
mac80211: remove TKIP debug
mac80211: two small verbose debug cleanups
mac80211: pass sdata to some RX functions
mac80211: clean up debugging
mac80211: rename driver-trace file
mac80211: trace debug messages
mac80211_hwsim: fix smatch/sparse complaints
mac80211: remove unused function
mac80211: make ieee80211_check_concurrent_iface netdev-independent
Thomas Pedersen (1):
nl80211: specify RSSI threshold in scheduled scan
Victor Goldenshtein (1):
mac80211: add command to get current rssi
drivers/net/wireless/mac80211_hwsim.c | 10 +-
include/linux/ieee80211.h | 2 +
include/linux/nl80211.h | 6 +
include/net/cfg80211.h | 2 +
include/net/mac80211.h | 29 +----
net/mac80211/Kconfig | 56 ++++++---
net/mac80211/Makefile | 6 +-
net/mac80211/agg-rx.c | 34 ++---
net/mac80211/agg-tx.c | 72 ++++++-----
net/mac80211/cfg.c | 30 ++---
net/mac80211/debug.h | 170 +++++++++++++++++++++++++
net/mac80211/debugfs_netdev.c | 5 +-
net/mac80211/driver-ops.h | 17 ++-
net/mac80211/driver-trace.c | 9 --
net/mac80211/ht.c | 10 +-
net/mac80211/ibss.c | 89 +++++++------
net/mac80211/ieee80211_i.h | 1 +
net/mac80211/iface.c | 21 +---
net/mac80211/key.c | 4 +-
net/mac80211/mesh.c | 4 -
net/mac80211/mesh_hwmp.c | 42 +++----
net/mac80211/mesh_pathtbl.c | 30 ++---
net/mac80211/mesh_plink.c | 61 ++++-----
net/mac80211/mesh_sync.c | 47 +++----
net/mac80211/mlme.c | 203 ++++++++++++++----------------
net/mac80211/offchannel.c | 1 -
net/mac80211/rx.c | 71 ++++-------
net/mac80211/sta_info.c | 44 +++----
net/mac80211/status.c | 11 +-
net/mac80211/tkip.c | 43 +------
net/mac80211/trace.c | 75 +++++++++++
net/mac80211/{driver-trace.h => trace.h} | 67 +++++++++-
net/mac80211/tx.c | 49 +++-----
net/wireless/nl80211.c | 9 +-
34 files changed, 768 insertions(+), 562 deletions(-)
create mode 100644 net/mac80211/debug.h
delete mode 100644 net/mac80211/driver-trace.c
create mode 100644 net/mac80211/trace.c
rename net/mac80211/{driver-trace.h => trace.h} (96%)
Attachment:
signature.asc
Description: This is a digitally signed message part
