From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Tue, 13 Dec 2011 12:51:28 +0000 (+0200)
Subject: ath6kl: call ath6kl_cfg80211_stop() from ath6kl_close()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ed8491a796558067200ae8a66570c83cb03cbd16;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ath6kl: call ath6kl_cfg80211_stop() from ath6kl_close()

This way it's possible to keep all disconnect logic in one function and
easier to add new functionality, like stopping scheduled scan.

There are some changes to commands called during network interface close,
but there should not be any visible changes in functionality.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---

diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 9cf48f449a34..1590182812b2 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -1007,16 +1007,7 @@ static int ath6kl_close(struct net_device *dev)
 
 	netif_stop_queue(dev);
 
-	ath6kl_disconnect(vif);
-
-	if (test_bit(WMI_READY, &ar->flag)) {
-		if (ath6kl_wmi_scanparams_cmd(ar->wmi, vif->fw_vif_idx, 0xFFFF,
-					      0, 0, 0, 0, 0, 0, 0, 0, 0))
-			return -EIO;
-
-	}
-
-	ath6kl_cfg80211_scan_complete_event(vif, true);
+	ath6kl_cfg80211_stop(ar);
 
 	clear_bit(WLAN_ENABLED, &vif->flags);