]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ath6kl: remove a workaround from ath6kl_cfg80211_stop()
authorKalle Valo <kvalo@qca.qualcomm.com>
Tue, 13 Dec 2011 12:51:10 +0000 (14:51 +0200)
committerKalle Valo <kvalo@qca.qualcomm.com>
Tue, 13 Dec 2011 13:03:45 +0000 (15:03 +0200)
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>
drivers/net/wireless/ath/ath6kl/cfg80211.c

index a58bea486b7bc85c85be2bee697095ea5dd4a885..9dd1f48977aa12368564c88d603129b2a22baffa 100644 (file)
@@ -2405,6 +2405,8 @@ void ath6kl_cfg80211_stop(struct ath6kl *ar)
        }
 
        switch (vif->sme_state) {
+       case SME_DISCONNECTED:
+               break;
        case SME_CONNECTING:
                cfg80211_connect_result(vif->ndev, vif->bssid, NULL, 0,
                                        NULL, 0,
@@ -2412,12 +2414,6 @@ void ath6kl_cfg80211_stop(struct ath6kl *ar)
                                        GFP_KERNEL);
                break;
        case SME_CONNECTED:
-       default:
-               /*
-                * FIXME: oddly enough smeState is in DISCONNECTED during
-                * suspend, why? Need to send disconnected event in that
-                * state.
-                */
                cfg80211_disconnected(vif->ndev, 0, NULL, 0, GFP_KERNEL);
                break;
        }