iwmc3200wifi: invalidate profile when necessary before connect

If cfg80211 requests to connect when we have already had an active
profile, invalidate the current profile first before sending a new
profile to UMAC.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
index a6e852f4f92..789ef5ca88b 100644
--- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c
+++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c
@@ -326,11 +326,8 @@ static int iwm_cfg80211_change_iface(struct wiphy *wiphy,
 
         iwm->umac_profile->mode = cpu_to_le32(iwm->conf.mode);
 
-        if (iwm->umac_profile_active) {
-                int ret = iwm_invalidate_mlme_profile(iwm);
-                if (ret < 0)
-                        IWM_ERR(iwm, "Couldn't invalidate profile\n");
-        }
+        if (iwm->umac_profile_active)
+                iwm_invalidate_mlme_profile(iwm);
 
         return 0;
 }
@@ -573,6 +570,14 @@ static int iwm_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
         if (!sme->ssid)
                 return -EINVAL;
 
+        if (iwm->umac_profile_active) {
+                ret = iwm_invalidate_mlme_profile(iwm);
+                if (ret) {
+                        IWM_ERR(iwm, "Couldn't invalidate profile\n");
+                        return ret;
+                }
+        }
+
         if (chan)
                 iwm->channel =
                         ieee80211_frequency_to_channel(chan->center_freq);