From 518de08556881573d29c437351ec0078d79b2b3f Mon Sep 17 00:00:00 2001 From: Raja Mani Date: Tue, 15 Nov 2011 14:14:56 +0530 Subject: [PATCH] --- yaml --- r: 279227 b: refs/heads/master c: 542c519a0eb94e5fece4c12b12ad9c84e8b66384 h: refs/heads/master i: 279225: 168e9fb04b844271e6103d3533c228dbe50c5ebf 279223: e698ff6f8a7e67a07970c1dc9c948163f6a3fd5f v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2c00a3eab3a9..788c3d2a3ca7 100644 --- 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 index 5241929877ec..d6d02ec89cc7 100644 --- 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 &&