Attachment 120520 Details for Bug 163318 – ieee80211_scan_check.diff

[patch] ieee80211_scan_check.diff

ieee80211_scan_check.diff (text/x-patch; charset=US-ASCII), 1.12 KB, created by adrian.chadd on 2012-02-26 00:38:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: adrian.chadd

Created: 2012-02-26 00:38:24 UTC

Size: 1.12 KB

patch

obsolete

>Index: sys/net80211/ieee80211_scan.c
>===================================================================
>--- sys/net80211/ieee80211_scan.c	(revision 232097)
>+++ sys/net80211/ieee80211_scan.c	(working copy)
>@@ -434,13 +434,12 @@
> 			ic->ic_flags |= IEEE80211_F_SCAN;
> 			ieee80211_runtask(ic, &SCAN_PRIVATE(ss)->ss_scan_task);
> 		}
>-		return 1;
> 	} else {
> 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
> 		    "%s: %s scan already in progress\n", __func__,
> 		    ss->ss_flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive");
> 	}
>-	return 0;
>+	return !! (ic->ic_flags & IEEE80211_F_SCAN);
> }
> 
> /*
>@@ -960,6 +959,17 @@
> 	IEEE80211_LOCK(ic);
> 
> 	/*
>+	 * Since a cancellation may have occured during one of the
>+	 * driver calls (whilst unlocked), update scandone.
>+	 */
>+	if (scandone == 0 &&
>+	    ((SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL) != 0)) {
>+		printf("%s: OOPS! scan cancelled during driver call!\n",
>+		    __func__);
>+	}
>+	scandone |= ((SCAN_PRIVATE(ss)->ss_iflags & ISCAN_CANCEL) != 0);
>+
>+	/*
> 	 * Record scan complete time.  Note that we also do
> 	 * this when canceled so any background scan will
> 	 * not be restarted for a while.

Actions: View | Diff

Attachments on bug 163318: 120520