From 771a27707552047ac97519729e20d0b85a727781 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Thu, 21 Jul 2011 09:40:00 +0300 Subject: [PATCH] --- yaml --- r: 265471 b: refs/heads/master c: b2c76bbe005cd23dfd80fe2140bd18daf4d3b16a h: refs/heads/master i: 265469: 5f04a24648e80e72daafc450629ee9b674cc3aca 265467: e448493657b51a3e201a3141a7f1a77077797355 265463: 04983c9d1ecc552c71d215e87cc2b9e860a15c1b 265455: 5b4f6463b9a2be52d015f7a147778784dc97f00a 265439: cecdcdbbbf943a65f7fae58ccb4072b9f51e451f 265407: 1abebf85a30441c580d1da449b1f12f3931f108b 265343: b45325965405fcbb1292892f6f15f63d0eb22a20 265215: cc8580b9643e3bfbac955a6ad4433ee999fc0924 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 72728712ad49..4ec3d9fcefe8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 575b5f34aa089cdaf92dda905d3b1dff1947f257 +refs/heads/master: b2c76bbe005cd23dfd80fe2140bd18daf4d3b16a diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index a70d2ac9e47b..b9090b876d45 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -779,7 +779,6 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, { struct ath6kl *ar = (struct ath6kl *)ath6kl_priv(ndev); int ret = 0; - u32 force_fg_scan = 0; if (!ath6kl_cfg80211_ready(ar)) return -EIO; @@ -807,10 +806,7 @@ static int ath6kl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, request->ssids[i].ssid); } - if (test_bit(CONNECTED, &ar->flag)) - force_fg_scan = 1; - - if (ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, force_fg_scan, + if (ath6kl_wmi_startscan_cmd(ar->wmi, WMI_LONG_SCAN, 0, false, 0, 0, 0, NULL) != 0) { ath6kl_err("wmi_startscan_cmd failed\n"); ret = -EIO;