From: Vladimir Kondratiev Date: Mon, 17 Mar 2014 13:34:20 +0000 (+0200) Subject: wil6210: fix secondary connect X-Git-Tag: v3.15-rc1~113^2~93^2^2~20 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4cd9e8377f6f18ffabad2cf0967855432db3dbce;p=~emulex%2Finfiniband.git wil6210: fix secondary connect when STA receiving connect() when already connected, it should return error Signed-off-by: Vladimir Kondratiev Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c index f6a12e7f80b..597540a307d 100644 --- a/drivers/net/wireless/ath/wil6210/cfg80211.c +++ b/drivers/net/wireless/ath/wil6210/cfg80211.c @@ -327,6 +327,10 @@ static int wil_cfg80211_connect(struct wiphy *wiphy, int ch; int rc = 0; + if (test_bit(wil_status_fwconnecting, &wil->status) || + test_bit(wil_status_fwconnected, &wil->status)) + return -EALREADY; + bss = cfg80211_get_bss(wiphy, sme->channel, sme->bssid, sme->ssid, sme->ssid_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);