PERFORCE change 83752 for review

[Sam Leffler]

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

Change 83752 by sam at 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);