Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

[karo-tx-linux.git] / drivers / net / wireless / iwlwifi / iwl-agn-rxon.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 00e6fc59e4590967625ef963c5ab58d4325b210b..58a381c01c89c9a367c7b592d65a49eb02457be0 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -26,10 +26,8 @@
 
 #include "iwl-dev.h"
 #include "iwl-agn.h"
-#include "iwl-sta.h"
 #include "iwl-core.h"
 #include "iwl-agn-calib.h"
-#include "iwl-helpers.h"
 #include "iwl-trans.h"
 #include "iwl-shared.h"
 
@@ -296,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);
 
@@ -370,7 +368,7 @@ int iwlagn_set_pan_params(struct iwl_priv *priv)
                        slot1 = IWL_MIN_SLOT_TIME;
                } else if (!ctx_pan->vif->bss_conf.idle &&
                           !ctx_pan->vif->bss_conf.assoc) {
-                       slot1 = bcnint * 3 - IWL_MIN_SLOT_TIME;
+                       slot1 = dtim * bcnint * 3 - IWL_MIN_SLOT_TIME;
                        slot0 = IWL_MIN_SLOT_TIME;
                }
        } else if (ctx_pan->vif) {
@@ -539,7 +537,7 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
        const struct iwl_channel_info *ch_info;
        int ret = 0;
 
-       IWL_DEBUG_MAC80211(priv, "changed %#x", changed);
+       IWL_DEBUG_MAC80211(priv, "enter: changed %#x", changed);
 
        mutex_lock(&priv->shrd->mutex);
 
@@ -657,6 +655,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
        }
  out:
        mutex_unlock(&priv->shrd->mutex);
+       IWL_DEBUG_MAC80211(priv, "leave\n");
+
        return ret;
 }