iwlagn: Sync rxon active with changes

We need to sync rxon_active with changes after we commit rxon_assoc,
without rxon_active will still have the old data that cause
iwl_send_rxon_assoc to fail with no change in rxon command.

Signed-off-by: Mohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index c523cc339eafa534d3bca4aa4135f7a18e6dc168..8f121fa3f325ae1d46ebc317ccb12924debcefbd 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -2238,6 +2238,7 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
                                     u32 changes)
 {
        struct iwl_priv *priv = hw->priv;
+       int ret;
 
        IWL_DEBUG_MAC80211(priv, "changes = 0x%X\n", changes);
 
@@ -2292,7 +2293,12 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw,
                }
        } else if (changes && iwl_is_associated(priv) && priv->assoc_id) {
                        IWL_DEBUG_MAC80211(priv, "Associated Changes %d\n", changes);
-                       iwl_send_rxon_assoc(priv);
+                       ret = iwl_send_rxon_assoc(priv);
+                       if (!ret)
+                               /* Sync active_rxon with latest change. */
+                               memcpy((void *)&priv->active_rxon,
+                                       &priv->staging_rxon,
+                                       sizeof(struct iwl_rxon_cmd));
        }
 
 }