Commit 107ef97a authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlagn: fix priv->cfg->ht_params NULL pointer dereference

This fix regression introduced by commit:

commit 15b3f3b0
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



Cc: stable@kernel.org # 3.1+
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f9a703e1
...@@ -294,8 +294,8 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv, ...@@ -294,8 +294,8 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
return ret; return ret;
} }
if ((ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) && if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&
priv->cfg->ht_params->smps_mode) priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)
ieee80211_request_smps(ctx->vif, ieee80211_request_smps(ctx->vif,
priv->cfg->ht_params->smps_mode); priv->cfg->ht_params->smps_mode);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment