John,
Please pull these changes. The most important thing is the locking
regression (deadlock) fix for one of Michal's recent patches.
I have a pending fix for the queue-related crash Larry reported, but I'm
waiting for him to test it again. If you haven't pulled by then, I'll
update this pull request to include that (and the hwsim test I used.)
Thanks!
johannes
----
The following changes since commit ba0afa2f22e1e3f332e45460f99328025d44564e:
mac80211: include VHT capability IE in probe requests (2012-07-02 15:13:09 +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 c5a7e582490c423f0685e42ee5cfb7c6de81adb0:
cfg80211: fix locking regression in monitor channel tracking (2012-07-04 13:30:23 +0200)
----------------------------------------------------------------
Johannes Berg (4):
mac80211: remove tx_frags driver callback
mac80211_hwsim: fix NUM_BANDS usage
mac80211: add TX prepare API
cfg80211: fix locking regression in monitor channel tracking
Thomas Huehn (1):
mac80211: reduce IEEE80211_TX_MAX_RATES
drivers/net/wireless/ath/carl9170/tx.c | 6 ++---
drivers/net/wireless/mac80211_hwsim.c | 4 ++--
drivers/net/wireless/p54/txrx.c | 6 ++---
include/net/mac80211.h | 38 ++++++++++++++++----------------
net/mac80211/driver-ops.h | 22 +++++++++++-------
net/mac80211/main.c | 2 +-
net/mac80211/mlme.c | 8 +++++++
net/mac80211/trace.h | 7 ++++++
net/mac80211/tx.c | 10 +++------
net/wireless/core.c | 8 ++-----
net/wireless/core.h | 4 +++-
11 files changed, 65 insertions(+), 50 deletions(-)
Attachment:
signature.asc
Description: This is a digitally signed message part
