---

yaml --- r: 279227 b: refs/heads/master c: 542c519 h: refs/heads/master i: 279225: 168e9fb 279223: e698ff6 v: v3
git-mirror · Nov 16, 2011 · 518de08 · 518de08
1 parent 5e75ca0
commit 518de08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 368b1b0f4b0328f488780605c423aafe1e6235b5
+refs/heads/master: 542c519a0eb94e5fece4c12b12ad9c84e8b66384
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -431,7 +431,8 @@ static int ath6kl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
 		status = ath6kl_set_assoc_req_ies(vif, sme->ie, sme->ie_len);
 		if (status)
 			return status;
-	}
+	} else
+		ar->connect_ctrl_flags &= ~CONNECT_WPS_FLAG;
 
 	if (test_bit(CONNECTED, &vif->flags) &&
 	    vif->ssid_len == sme->ssid_len &&