diff options
| author |   Stanislaw Gruszka <sgruszka@redhat.com> | 2011-10-12 10:16:35 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2011-10-14 14:48:16 -0400 |
| commit | 107ef97a170dec95893f34614edd92eb8cb9b5d0 (patch) | |
| tree | a53c6939653d75a72ac1c6cac5d6b1ab5f4f8de2 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |
| parent | iwmc3200wifi: add a range check to iwm_cfg80211_get_key() (diff) | |
| download | linux-dev-107ef97a170dec95893f34614edd92eb8cb9b5d0.tar.xz linux-dev-107ef97a170dec95893f34614edd92eb8cb9b5d0.zip | |
iwlagn: fix priv->cfg->ht_params NULL pointer dereference
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
Cc: stable@kernel.org # 3.1+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to '')
| -rw-r--r-- | 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 a580efefd4b4..58a381c01c89 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -294,8 +294,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); |