[kernel/f16] Add iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch back to compat-wireless

[Josh Boyer]

commit 343c19468fb09466f616dd94beb99030fe3a97ec
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Sat Jan 7 08:05:12 2012 -0500

    Add iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch back to
    compat-wireless

 ...allow-to-switch-to-HT40-if-not-associated.patch |   40 ++++++++++++++++++++
 kernel.spec                                        |    8 +++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch b/iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
new file mode 100644
index 0000000..7ded9c8
--- /dev/null
+++ b/iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
@@ -0,0 +1,40 @@
+From 78feb35b8161acd95c33a703ed6ab6f554d29387 Mon Sep 17 00:00:00 2001
+From: Wey-Yi Guy <wey-yi.w.guy at intel.com>
+Date: Wed, 14 Dec 2011 08:22:36 -0800
+Subject: [PATCH 2/2] iwlwifi: allow to switch to HT40 if not associated
+
+My previous patch
+34a5b4b6af104cf18eb50748509528b9bdbc4036 iwlwifi: do not re-configure
+HT40 after associated
+
+Fix the case of HT40 after association on specified AP, but it break the
+association for some APs and cause not able to establish connection.
+We need to address HT40 before and after addociation.
+
+CC: stable at vger.kernel.org #3.0+
+Reported-by: Andrej Gelenberg <andrej.gelenberg at udo.edu>
+Signed-off-by: Wey-Yi Guy <wey-yi.w.guy at intel.com>
+Tested-by: Andrej Gelenberg <andrej.gelenberg at udo.edu>
+Signed-off-by: John W. Linville <linville at tuxdriver.com>
+---
+ drivers/net/wireless/iwlwifi/iwl-agn-rxon.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+index a7a6def..5c7c17c 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+@@ -606,8 +606,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
+ 			if (ctx->ht.enabled) {
+ 				/* if HT40 is used, it should not change
+ 				 * after associated except channel switch */
+-				if (iwl_is_associated_ctx(ctx) &&
+-				     !ctx->ht.is_40mhz)
++				if (!ctx->ht.is_40mhz ||
++						!iwl_is_associated_ctx(ctx))
+ 					iwlagn_config_ht40(conf, ctx);
+ 			} else
+ 				ctx->ht.is_40mhz = false;
+-- 
+1.7.4.4
+
diff --git a/kernel.spec b/kernel.spec
index c7d0562..c188e98 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -864,6 +864,7 @@ Patch50101: ath9k-fix-max-phy-rate-at-rate-control-init.patch
 Patch50102: iwlwifi-do-not-set-the-sequence-control-bit-is-not-n.patch
 Patch50103: iwlwifi-update-SCD-BC-table-for-all-SCD-queues.patch
 Patch50104: mwifiex-avoid-double-list_del-in-command-cancel-path.patch
+Patch50105: iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
 
 #rhbz 771058
 Patch22100: msi-irq-sysfs-warning.patch
@@ -1670,6 +1671,7 @@ ApplyPatch iwlwifi-do-not-set-the-sequence-control-bit-is-not-n.patch
 ApplyPatch ath9k-fix-max-phy-rate-at-rate-control-init.patch
 ApplyPatch mwifiex-avoid-double-list_del-in-command-cancel-path.patch
 ApplyPatch iwlwifi-tx_sync-only-on-PAN-context.patch
+ApplyPatch iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
 ApplyPatch iwlwifi-update-SCD-BC-table-for-all-SCD-queues.patch
 
 cd ..
@@ -2372,6 +2374,10 @@ fi
 # and build.
 
 %changelog
+* Sat Jan 07 2012 Josh Boyer <jwboyer at redhat.com> 3.1.8-2
+- Add iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch back to
+  compat-wireless
+
 * Fri Jan 06 2012 Josh Boyer <jwboyer at redhat.com> 3.1.8-1
 - Disable backports on arches where we don't actually build a kernel (or config)
 - Linux 3.1.8