diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-06 15:22:29 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-05-06 15:22:29 -0300 |
| commit | d48da3adb2e5eaab66403aa3f0fce2d78f3ecd12 (patch) | |
| tree | 5ee819230850950842e1fb61d7ca156eef7d8fd4 /kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch | |
| parent | 43aea814a4cda71f48a3fd7c3b7cb2d6318e043a (diff) | |
| parent | 7033c58cfeb084f26e1a9b9aa90e45ebc8a739a0 (diff) | |
| download | abslibre-d48da3adb2e5eaab66403aa3f0fce2d78f3ecd12.tar.gz abslibre-d48da3adb2e5eaab66403aa3f0fce2d78f3ecd12.tar.bz2 abslibre-d48da3adb2e5eaab66403aa3f0fce2d78f3ecd12.zip | |
Merge branch 'master' of ssh://gparabola/srv/git/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, 0 insertions, 38 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 deleted file mode 100644 index a53a3a425..000000000 --- a/kernels/linux-libre-aufs_friendly/iwlagn-fix-NULL-pointer-dereference.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 |