John,
Please pull these fixes for the 3.6 stream from my tree as below.
Included are a few fixes for various things I found doing code
inspection for my multi-channel work and a few fixes from others. I've
included Seth's patch for the non-OFDM flag that's a requirement for the
bcrmsmac locking fix so you can pick up that patch after you pull.
I'm going to be on vacation next week and the week after, and though I
won't be away from home for all the time, it'd be great if you could
pick up urgent fixes for mac80211/cfg80211 for the 3.6 stream until I
return.
Since the merge window hasn't even closed yet I'm not going to send a
pull request for my mac80211-next tree before I return, but it's there
and has a bunch of work in it. I'll send a preview out in a bit though.
johannes
------
The following changes since commit 9dbf5f55f8d35ff9aedc75267f4e4042aaf89755:
bcma: add missing iounmap on error path (2012-07-26 15:37:57 -0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git for-john
for you to fetch changes up to 899852af60c212bfe9a2fb71d4d9082d2622df5c:
cfg80211: Clear "beacon_found" on regulatory restore (2012-08-02 15:34:22 +0200)
----------------------------------------------------------------
Eliad Peller (1):
mac80211: don't clear sched_scan_sdata on sched scan stop request
Johannes Berg (4):
mac80211: fix scan_sdata assignment
Merge remote-tracking branch 'wireless/master' into mac80211
mac80211: clear timer bits when disconnecting
mac80211: cancel mesh path timer
Paul Stewart (1):
cfg80211: Clear "beacon_found" on regulatory restore
Seth Forshee (1):
cfg80211: add channel flag to prohibit OFDM operation
Stanislaw Gruszka (1):
wireless: reg: restore previous behaviour of chan->max_power calculations
include/net/cfg80211.h | 2 ++
net/mac80211/mesh.c | 3 +++
net/mac80211/mlme.c | 2 ++
net/mac80211/scan.c | 3 +--
net/wireless/reg.c | 19 ++++++++++++++++++-
5 files changed, 26 insertions(+), 3 deletions(-)
Attachment:
signature.asc
Description: This is a digitally signed message part
