iwlagn: don't resend RXON timing

Resending RXON timing here caused issues with
dual-mode under certain circumstances, so avoid
doing it here right now.

This effectively reverts b01efe434bd6ea807eb72b
and partially 2491fa42d9bdf26075765. The next
patch will make all this cleaner for just the
devices that need it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index e3533a89ec9c74be7d836928439f204be3c95157..3d1f6831cc209d3dc49ad7e88acb25b51dc32521 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -105,7 +105,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
        int ret;
        bool new_assoc =
                !!(ctx->staging.filter_flags & RXON_FILTER_ASSOC_MSK);
-       bool old_assoc = !!(ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK);
 
        if (!iwl_is_alive(priv))
                return -EBUSY;
@@ -186,19 +185,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
 
        iwl_set_rxon_hwcrypto(priv, ctx, !priv->cfg->mod_params->sw_crypto);
 
-       if (!old_assoc) {
-               /*
-                * First of all, before setting associated, we need to
-                * send RXON timing so the device knows about the DTIM
-                * period and other timing values
-                */
-               ret = iwl_send_rxon_timing(priv, ctx);
-               if (ret) {
-                       IWL_ERR(priv, "Error setting RXON timing!\n");
-                       return ret;
-               }
-       }
-
        if (priv->cfg->ops->hcmd->set_pan_params) {
                ret = priv->cfg->ops->hcmd->set_pan_params(priv);
                if (ret)