diff options
author | Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> | 2013-05-28 08:17:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-05-29 15:22:32 -0400 |
commit | b338f74e33e33616e8fe498b5b09da8a84a7b218 (patch) | |
tree | c1308e7257d4ac17b4c5f3fb02c07f8e31f24fe7 /drivers/net/wireless/ath/wil6210/wmi.c | |
parent | adc2d1225bed4bbf68473e6b5c4b91d2445609cb (diff) |
wil6210: Don't use wdev->sme_state
sme_state is private wdev's variable.
Track connection state internally
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/wil6210/wmi.c')
-rw-r--r-- | drivers/net/wireless/ath/wil6210/wmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c index a091eb11e392..527ffb543821 100644 --- a/drivers/net/wireless/ath/wil6210/wmi.c +++ b/drivers/net/wireless/ath/wil6210/wmi.c | |||
@@ -409,7 +409,7 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len) | |||
409 | 409 | ||
410 | if ((wdev->iftype == NL80211_IFTYPE_STATION) || | 410 | if ((wdev->iftype == NL80211_IFTYPE_STATION) || |
411 | (wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) { | 411 | (wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) { |
412 | if (wdev->sme_state != CFG80211_SME_CONNECTING) { | 412 | if (!test_bit(wil_status_fwconnecting, &wil->status)) { |
413 | wil_err(wil, "Not in connecting state\n"); | 413 | wil_err(wil, "Not in connecting state\n"); |
414 | return; | 414 | return; |
415 | } | 415 | } |
@@ -433,6 +433,7 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len) | |||
433 | 433 | ||
434 | cfg80211_new_sta(ndev, evt->bssid, &sinfo, GFP_KERNEL); | 434 | cfg80211_new_sta(ndev, evt->bssid, &sinfo, GFP_KERNEL); |
435 | } | 435 | } |
436 | clear_bit(wil_status_fwconnecting, &wil->status); | ||
436 | set_bit(wil_status_fwconnected, &wil->status); | 437 | set_bit(wil_status_fwconnected, &wil->status); |
437 | 438 | ||
438 | /* FIXME FW can transmit only ucast frames to peer */ | 439 | /* FIXME FW can transmit only ucast frames to peer */ |