diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 85eea944498..1d58b1c7fac 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -105,6 +105,7 @@ int iwl_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) | |||
105 | int ret; | 105 | int ret; |
106 | bool new_assoc = | 106 | bool new_assoc = |
107 | !!(ctx->staging.filter_flags & RXON_FILTER_ASSOC_MSK); | 107 | !!(ctx->staging.filter_flags & RXON_FILTER_ASSOC_MSK); |
108 | bool old_assoc = !!(ctx->active.filter_flags & RXON_FILTER_ASSOC_MSK); | ||
108 | 109 | ||
109 | if (!iwl_is_alive(priv)) | 110 | if (!iwl_is_alive(priv)) |
110 | return -EBUSY; | 111 | return -EBUSY; |
@@ -182,7 +183,7 @@ int iwl_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) | |||
182 | 183 | ||
183 | iwl_set_rxon_hwcrypto(priv, ctx, !priv->cfg->mod_params->sw_crypto); | 184 | iwl_set_rxon_hwcrypto(priv, ctx, !priv->cfg->mod_params->sw_crypto); |
184 | 185 | ||
185 | if (new_assoc) { | 186 | if (!old_assoc) { |
186 | /* | 187 | /* |
187 | * First of all, before setting associated, we need to | 188 | * First of all, before setting associated, we need to |
188 | * send RXON timing so the device knows about the DTIM | 189 | * send RXON timing so the device knows about the DTIM |