From: Dan Williams <dcbw@redhat.com>
Date: Sat, 26 May 2007 02:38:41 +0000 (-0400)
Subject: [PATCH] libertas: send SIOCGIWSCAN event after partial scans too
X-Git-Tag: v2.6.22-rc5~44^2~2^2~18
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9ad2f5df89c66b5eae6ac5aaabe62508baba4ef;p=linux-2.6

[PATCH] libertas: send SIOCGIWSCAN event after partial scans too

Any time the driver gets new scan results, even from partial scans,
it should send the scan event to userspace.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 83b1612e84..ec16cd08ae 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -707,19 +707,19 @@ static int wlan_scan_channel_list(wlan_private * priv,
 		ret = libertas_prepare_and_send_command(priv, cmd_802_11_scan, 0,
 					    0, 0, pscancfgout);
 		if (scanned >= 2 && !full_scan) {
-			priv->adapter->last_scanned_channel = ptmpchan->channumber;
 			ret = 0;
 			goto done;
 		}
 		scanned = 0;
 	}
 
+done:
 	priv->adapter->last_scanned_channel = ptmpchan->channumber;
 
+	/* Tell userspace the scan table has been updated */
 	memset(&wrqu, 0, sizeof(union iwreq_data));
 	wireless_send_event(priv->dev, SIOCGIWSCAN, &wrqu, NULL);
 
-done:
 	lbs_deb_leave_args(LBS_DEB_SCAN, "ret %d", ret);
 	return ret;
 }