From owner-p4-projects@FreeBSD.ORG  Fri Sep 16 20:37:49 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1A79816A421; Fri, 16 Sep 2005 20:37:49 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E5B5F16A41F
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:37:48 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B2E2C43D46
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:37:48 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8GKbmmh020432
	for <perforce@freebsd.org>; Fri, 16 Sep 2005 20:37:48 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8GKbmlj020429
	for perforce@freebsd.org; Fri, 16 Sep 2005 20:37:48 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 16 Sep 2005 20:37:48 GMT
Message-Id: <200509162037.j8GKbmlj020429@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 83752 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Sep 2005 20:37:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=83752

Change 83752 by sam@sam_ebb on 2005/09/16 20:37:22

	display scanvalid when != bgscaninterval

Affected files ...

.. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#47 edit

Differences ...

==== //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#47 (text+ko) ====

@@ -1472,7 +1472,7 @@
 {
 	static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
 	enum ieee80211_opmode opmode = get80211opmode(s);
-	int i, num, wpa, wme, bgscan;
+	int i, num, wpa, wme, bgscan, bgscaninterval;
 	struct ieee80211req ireq;
 	u_int8_t data[32];
 	const struct ieee80211_channel *c;
@@ -1700,6 +1700,18 @@
 			LINE_CHECK("%cmcastrate %d", spacer, ireq.i_val/2);
 	}
 
+	ireq.i_type = IEEE80211_IOC_BGSCAN_INTERVAL;
+	if (ioctl(s, SIOCG80211, &ireq) != -1)
+		bgscaninterval = ireq.i_val;
+	else
+		bgscaninterval = -1;
+
+	ireq.i_type = IEEE80211_IOC_SCANVALID;
+	if (ioctl(s, SIOCG80211, &ireq) != -1) {
+		if (ireq.i_val != bgscaninterval || verbose)
+			LINE_CHECK("%cscanvalid %u", spacer, ireq.i_val);
+	}
+
 	ireq.i_type = IEEE80211_IOC_BGSCAN;
 	if (ioctl(s, SIOCG80211, &ireq) != -1) {
 		bgscan = ireq.i_val;
@@ -1709,9 +1721,8 @@
 			LINE_CHECK("%c-bgscan", spacer);
 	}
 	if (bgscan || verbose) {
-		ireq.i_type = IEEE80211_IOC_BGSCAN_INTERVAL;
-		if (ioctl(s, SIOCG80211, &ireq) != -1)
-			LINE_CHECK("%cbgscanintvl %u", spacer, ireq.i_val);
+		if (bgscaninterval != -1)
+			LINE_CHECK("%cbgscanintvl %u", spacer, bgscaninterval);
 		ireq.i_type = IEEE80211_IOC_BGSCAN_IDLE;
 		if (ioctl(s, SIOCG80211, &ireq) != -1)
 			LINE_CHECK("%cbgscanidle %u", spacer, ireq.i_val);