diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-03-12 12:38:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-03-12 12:38:40 -0300 |
| commit | da3e14b1c0836ab3facc47d4645942d92b2f4760 (patch) | |
| tree | 2064d6087d6fadd8b4969a77fbf1e7d70b760733 /kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch | |
| parent | d3e5d228125973838465eef2a151c89044f9e7f8 (diff) | |
| parent | 2a5aebb2f7996f804dcf8355e86ae72010b42b9a (diff) | |
| download | abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.tar.gz abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.tar.bz2 abslibre-da3e14b1c0836ab3facc47d4645942d92b2f4760.zip | |
Merge branch 'master' of ssh://gparabola/abslibre
Diffstat (limited to 'kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch')
| -rw-r--r-- | kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch b/kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch new file mode 100644 index 000000000..a53a3a425 --- /dev/null +++ b/kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch @@ -0,0 +1,38 @@ +This fix regression introduced by commit: + +commit 15b3f3b006b42a678523cad989bfd60b76bf4403 +Author: Wey-Yi Guy <wey-yi.w.guy@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@kernel.org # 3.1+ +Signed-off-by: Stanislaw Gruszka <sgruszka@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 |