---

yaml --- r: 279243 b: refs/heads/master c: ed8491a h: refs/heads/master i: 279241: 65a0c75 279239: b14355f v: v3
git-mirror · Dec 13, 2011 · ae86165 · ae86165
1 parent 9f7f04f
commit ae86165
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c97a31b002d34595f74d2cb0d8017c183e7157d4
+refs/heads/master: ed8491a796558067200ae8a66570c83cb03cbd16
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/main.c b/trunk/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);