]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ath6kl: Clear WPS ctrl flag if zero length IE is received from cfg80211
authorRaja Mani <rmani@qca.qualcomm.com>
Tue, 15 Nov 2011 08:44:56 +0000 (14:14 +0530)
committerKalle Valo <kvalo@qca.qualcomm.com>
Wed, 16 Nov 2011 08:39:39 +0000 (10:39 +0200)
Connect control flag CONNECT_WPS_FLAG has to be cleared
by default even if the driver receives zero length IE
from cfg80211.

Otherwise this flag would be always set after WPS exchange
which would lead wpa_supplicant to fail to connect with
the received WPS credentials. This issue is observed only
in OPEN security.

kvalo: use cfg80211 instead of CFG in the commit log

Signed-off-by: Raja Mani <rmani@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
drivers/net/wireless/ath/ath6kl/cfg80211.c

index 5241929877ec73c186770ba1dbc55678702b34f0..d6d02ec89cc772bda1f9d584e1309de8c5987c32 100644 (file)
@@ -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 &&