[kernel/f16] Add patch from Stanislaw Gruszka to fix iwlagn NULL dereference (rhbz 744155)

[Josh Boyer]

commit a2975f8e0c1e14b291798b5f309c941aab7fd3db
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Oct 13 08:48:28 2011 -0400

    Add patch from Stanislaw Gruszka to fix iwlagn NULL dereference (rhbz 744155)

 ...gn-fix-ht_params-NULL-pointer-dereference.patch |   43 ++++++++++++++++++++
 kernel.spec                                        |    9 ++++-
 2 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/iwlagn-fix-ht_params-NULL-pointer-dereference.patch b/iwlagn-fix-ht_params-NULL-pointer-dereference.patch
new file mode 100644
index 0000000..4dcf490
--- /dev/null
+++ b/iwlagn-fix-ht_params-NULL-pointer-dereference.patch
@@ -0,0 +1,43 @@
+This fix regression introduced by commit:
+
+commit 15b3f3b006b42a678523cad989bfd60b76bf4403
+Author: Wey-Yi Guy <wey-yi.w.guy at intel.com>
+Date:   Fri Jun 3 07:54:13 2011 -0700
+
+    iwlagn: set smps mode after assoc for 1000 device
+
+Also remove unneeded brackets on the way.
+
+Address:
+https://bugzilla.redhat.com/show_bug.cgi?id=744155
+
+If fix will not get 3.1 release, it should be applied in 3.1 stable.
+
+Cc: stable at kernel.org # 3.1+
+Signed-off-by: Stanislaw Gruszka <sgruszka at redhat.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 ca632f9..5004342 100644
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+@@ -296,8 +296,8 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
+ 		return ret;
+ 	}
+ 
+-	if ((ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) &&
+-	    priv->cfg->ht_params->smps_mode)
++	if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&
++	    priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)
+ 		ieee80211_request_smps(ctx->vif,
+ 				       priv->cfg->ht_params->smps_mode);
+ 
+-- 
+1.7.1
+
+--
+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 7f5575f..4d73531 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -51,7 +51,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be prepended with "0.", so
 # for example a 3 here will become 0.3
 #
-%global baserelease 2
+%global baserelease 3
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -730,6 +730,8 @@ Patch13009: hvcs_pi_buf_alloc.patch
 
 Patch13013: powerpc-Fix-deadlock-in-icswx-code.patch
 
+Patch13014: iwlagn-fix-ht_params-NULL-pointer-dereference.patch
+
 Patch20000: utrace.patch
 
 # Flattened devicetree support
@@ -1353,6 +1355,8 @@ ApplyPatch hvcs_pi_buf_alloc.patch
 
 ApplyPatch powerpc-Fix-deadlock-in-icswx-code.patch
 
+ApplyPatch iwlagn-fix-ht_params-NULL-pointer-dereference.patch
+
 #rhbz #722509
 ApplyPatch mmc-Always-check-for-lower-base-frequency-quirk-for-.patch
 
@@ -2060,6 +2064,9 @@ fi
 # and build.
 
 %changelog
+* Thu Oct 13 2011 Josh Boyer <jwboyer at redhat.com>
+- Add patch from Stanislaw Gruszka to fix iwlagn NULL dereference (rhbz 744155)
+
 * Tue Oct 11 2011 Josh Boyer <jwboyer at redhat.com>
 - Disable CONFIG_XEN_BALLOON_MEMORY_HOTPLUG (rhbz 744408)