---

yaml --- r: 265471 b: refs/heads/master c: b2c76bb h: refs/heads/master i: 265469: 5f04a24 265467: e448493 265463: 04983c9 265455: 5b4f646 265439: cecdcdb 265407: 1abebf8 265343: b453259 265215: cc8580b v: v3
git-mirror · Aug 9, 2011 · 771a277 · 771a277
1 parent 091fdef
commit 771a277
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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;