From ae86165ba549e623a1f017aded0c707c9a758160 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 13 Dec 2011 14:51:28 +0200 Subject: [PATCH] --- yaml --- r: 279243 b: refs/heads/master c: ed8491a796558067200ae8a66570c83cb03cbd16 h: refs/heads/master i: 279241: 65a0c756251903716815484418569cce31493a31 279239: b14355fb397b02ef731d0be5ae9df64d464d95f8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/main.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 116e396eeec4..65706003e864 100644 --- 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 index 9cf48f449a34..1590182812b2 100644 --- 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);