aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath6kl/cfg80211.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2011-12-13 07:51:10 -0500
committerKalle Valo <kvalo@qca.qualcomm.com>2011-12-13 08:03:45 -0500
commitc97a31b002d34595f74d2cb0d8017c183e7157d4 (patch)
tree9b0880405e1eac2047f1a88537a94109f089fe6f /drivers/net/wireless/ath/ath6kl/cfg80211.c
parentd6d5c06c3cf6b1b5b4ffaac8a05c0cea97f90857 (diff)
ath6kl: remove a workaround from ath6kl_cfg80211_stop()
There's a workaround in ath6kl_cfg80211_stop() which emits disconnected even when sme_state was disconnected. This is legacy from the old staging driver and I can't repoduce the old problem anymore. I assume the bug got fixed while the driver was cleaned up so let's get rid of the hack. This makes it possible to call ath6kl_cfg80211_stop from ath6kl_close() which happens in a followup patch. Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/cfg80211.c')
-rw-r--r--drivers/net/wireless/ath/ath6kl/cfg80211.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index a58bea486b7b..9dd1f48977aa 100644
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2405,6 +2405,8 @@ void ath6kl_cfg80211_stop(struct ath6kl *ar)
2405 } 2405 }
2406 2406
2407 switch (vif->sme_state) { 2407 switch (vif->sme_state) {
2408 case SME_DISCONNECTED:
2409 break;
2408 case SME_CONNECTING: 2410 case SME_CONNECTING:
2409 cfg80211_connect_result(vif->ndev, vif->bssid, NULL, 0, 2411 cfg80211_connect_result(vif->ndev, vif->bssid, NULL, 0,
2410 NULL, 0, 2412 NULL, 0,
@@ -2412,12 +2414,6 @@ void ath6kl_cfg80211_stop(struct ath6kl *ar)
2412 GFP_KERNEL); 2414 GFP_KERNEL);
2413 break; 2415 break;
2414 case SME_CONNECTED: 2416 case SME_CONNECTED:
2415 default:
2416 /*
2417 * FIXME: oddly enough smeState is in DISCONNECTED during
2418 * suspend, why? Need to send disconnected event in that
2419 * state.
2420 */
2421 cfg80211_disconnected(vif->ndev, 0, NULL, 0, GFP_KERNEL); 2417 cfg80211_disconnected(vif->ndev, 0, NULL, 0, GFP_KERNEL);
2422 break; 2418 break;
2423 } 2419 }