[kernel/f15] Add patch to fix Intel wifi regression in 3.1.5 (rhbz 767173)

[Josh Boyer]

commit ddeb23923b8adf309a1f5f882e6225ce9064ba07
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Dec 15 10:21:49 2011 -0500

    Add patch to fix Intel wifi regression in 3.1.5 (rhbz 767173)

 ...allow-to-switch-to-HT40-if-not-associated.patch |   38 ++++++++++++++++++++
 kernel.spec                                        |   11 +++++-
 2 files changed, 47 insertions(+), 2 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..08c9e44
--- /dev/null
+++ b/iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
@@ -0,0 +1,38 @@
+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>
+---
+ 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.0.4
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/kernel.spec b/kernel.spec
index 4c3a327..6052844 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
 # When changing real_sublevel below, reset this by hand to 1
 # (or to 0 and then use rpmdev-bumpspec).
 #
-%global baserelease 3
+%global baserelease 4
 %global fedora_build %{baserelease}
 
 # real_sublevel is the 3.x kernel version we're starting with
@@ -715,6 +715,9 @@ Patch21045: nfs-client-freezer.patch
 #rhbz 590880
 Patch21046: alps.patch
 
+#rhbz 767173
+Patch21047: iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1324,6 +1327,9 @@ ApplyPatch nfs-client-freezer.patch
 #rhbz 590880
 ApplyPatch alps.patch
 
+#rhbz 767173
+ApplyPatch iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1971,7 +1977,8 @@ fi
 # and build.
 
 %changelog
-* Thu Dec 15 2011 Josh Boyer <jwboyer at redhat.com>
+* Thu Dec 15 2011 Josh Boyer <jwboyer at redhat.com> - 2.6.41.5-4
+- Add patch to fix Intel wifi regression in 3.1.5 (rhbz 767173)
 - Add patch from Jeff Layton to fix suspend with NFS (rhbz #717735)
 - Backport ALPS touchpad patches from input/next branch (rhbz #590880)