From 1af1e7f5b3647b47df00ffa33fc93be7e93e38ec Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 25 May 2007 22:38:41 -0400 Subject: [PATCH] --- yaml --- r: 57668 b: refs/heads/master c: d9ad2f5df89c66b5eae6ac5aaabe62508baba4ef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/scan.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 22fe27a1ba29..e005a8433a57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aeea0ab45ae3d761064ca926863bb41f0ad167ce +refs/heads/master: d9ad2f5df89c66b5eae6ac5aaabe62508baba4ef diff --git a/trunk/drivers/net/wireless/libertas/scan.c b/trunk/drivers/net/wireless/libertas/scan.c index 83b1612e84bf..ec16cd08aead 100644 --- a/trunk/drivers/net/wireless/libertas/scan.c +++ b/trunk/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; }