linux-vserver/iwlagn-fix-NULL-pointer-dereference.patch

   1 This fix regression introduced by commit:
   2
   3 commit 15b3f3b006b42a678523cad989bfd60b76bf4403
   4 Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
   5 Date:   Fri Jun 3 07:54:13 2011 -0700
   6
   7     iwlagn: set smps mode after assoc for 1000 device
   8
   9 Also remove unneeded brackets on the way.
  10
  11 Address:
  12 https://bugzilla.redhat.com/show_bug.cgi?id=744155
  13
  14 If fix will not get 3.1 release, it should be applied in 3.1 stable.
  15
  16 Cc: stable@kernel.org # 3.1+
  17 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
  18 ---
  19  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c |    4 ++--
  20  1 files changed, 2 insertions(+), 2 deletions(-)
  21
  22 diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
  23 index ca632f9..5004342 100644
  24 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
  25 +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
  26 @@ -296,8 +296,8 @@ static int iwlagn_rxon_connect(struct iwl_priv *priv,
  27                 return ret;
  28         }
  29
  30 -       if ((ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) &&
  31 -           priv->cfg->ht_params->smps_mode)
  32 +       if (ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION &&
  33 +           priv->cfg->ht_params && priv->cfg->ht_params->smps_mode)
  34                 ieee80211_request_smps(ctx->vif,
  35                                        priv->cfg->ht_params->smps_mode);
  36
  37 --
  38 1.7.1