[kernel/f14/master] add cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch

[Kyle McMartin]

commit 20692ec6bcfe606fc7e61afa2230424413715f2c
Author: Kyle McMartin <kyle at redhat.com>
Date:   Wed Mar 16 16:24:31 2011 -0400

    add cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
    
    Fix a regression in cfg80211 ht40 support from 2.6.35, patch from
    Mark Mentovai and Stanislaw Gruszka. Thanks! (#671514)

 ...211-fix-can_beacon_sec_chan-reenable-ht40.patch |   46 ++++++++++++++++++++
 kernel.spec                                        |   12 +++++-
 2 files changed, 57 insertions(+), 1 deletions(-)
---
diff --git a/cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch b/cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
new file mode 100644
index 0000000..5ac9d2e
--- /dev/null
+++ b/cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
@@ -0,0 +1,46 @@
+From sgruszka at redhat.com Wed Mar 16 09:53:12 2011
+From: Stanislaw Gruszka <sgruszka at redhat.com>
+To: kernel at lists.fedoraproject.org, Kyle McMartin <kmcmartin at redhat.com>
+Cc: Stanislaw Gruszka <sgruszka at redhat.com>, stable at kernel.org
+Subject: [PATCH 2.6.35] cfg80211: fix can_beacon_sec_chan, reenable HT40
+Date: Wed, 16 Mar 2011 14:52:53 +0100
+Message-Id: <1300283573-3151-1-git-send-email-sgruszka at redhat.com>
+
+From: Mark Mentovai <mark at moxienet.com>
+
+commit 09a02fdb919876c01e8f05960750a418b3f7fa48 upstream.
+
+Fixes 2.6.35.9 -> 2.6.35.11 regression:
+https://bugzilla.redhat.com/show_bug.cgi?id=671514
+
+This follows wireless-testing 9236d838c920e90708570d9bbd7bb82d30a38130
+("cfg80211: fix extension channel checks to initiate communication") and
+fixes accidental case fall-through. Without this fix, HT40 is entirely
+blocked.
+
+Signed-off-by: Mark Mentovai <mark at moxienet.com>
+Cc: stable at kernel.org
+Acked-by: Luis R. Rodriguez <lrodriguez at atheros.com
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ net/wireless/chan.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/net/wireless/chan.c b/net/wireless/chan.c
+index c8d190d..17cd0c0 100644
+--- a/net/wireless/chan.c
++++ b/net/wireless/chan.c
+@@ -54,8 +54,10 @@ static bool can_beacon_sec_chan(struct wiphy *wiphy,
+ 	switch (channel_type) {
+ 	case NL80211_CHAN_HT40PLUS:
+ 		diff = 20;
++		break;
+ 	case NL80211_CHAN_HT40MINUS:
+ 		diff = -20;
++		break;
+ 	default:
+ 		return false;
+ 	}
+-- 
+1.7.1
+
diff --git a/kernel.spec b/kernel.spec
index f0d43a7..12d7fb3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 85
+%global baserelease 86
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -847,6 +847,9 @@ Patch13710: linux-2.6-bonding-sysfs-warning.patch
 # rhbz#680791
 Patch13711: md-fix-regression-resulting-in-delays-in-clearing-bits-in-a-bitmap.patch
 
+# rhbz#671514
+Patch13712: cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1599,6 +1602,9 @@ ApplyPatch linux-2.6-bonding-sysfs-warning.patch
 # rhbz#680791
 ApplyPatch md-fix-regression-resulting-in-delays-in-clearing-bits-in-a-bitmap.patch
 
+# rhbz#671514
+ApplyPatch cfg80211-fix-can_beacon_sec_chan-reenable-ht40.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2185,6 +2191,10 @@ fi
 # and build.
 
 %changelog
+* Wed Mar 16 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.35.11-86
+- Fix a regression in cfg80211 ht40 support from 2.6.35, patch from
+  Mark Mentovai and Stanislaw Gruszka. Thanks!
+
 * Tue Mar 01 2011 Jarod Wilson <jarod at redhat.com> 2.6.35.11-85
 - Fix IR wakeup on nuvoton-cir-driven hardware
 - Make mceusb only bind to the IR interface on Realtek multifuction thingy