PERFORCE change 117389 for review

[Sam Leffler]

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

Change 117389 by sam at sam_ebb on 2007/04/04 19:10:18

	IFC

Affected files ...

.. //depot/projects/wifi/sbin/ifconfig/af_ipx.c#4 integrate
.. //depot/projects/wifi/sbin/ifconfig/ifconfig.8#21 integrate
.. //depot/projects/wifi/sbin/ifconfig/ifconfig.c#20 integrate
.. //depot/projects/wifi/sbin/ifconfig/ifieee80211.c#63 integrate

Differences ...

==== //depot/projects/wifi/sbin/ifconfig/af_ipx.c#4 (text+ko) ====

@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/ifconfig/af_ipx.c,v 1.2 2007/02/24 23:55:46 sam Exp $";
+  "$FreeBSD: src/sbin/ifconfig/af_ipx.c,v 1.3 2007/03/09 23:28:40 sam Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -66,7 +66,7 @@
 	printf("\tipx %s ", ipx_ntoa(sipx->sipx_addr));
 
 	if (ifa->ifa_flags & IFF_POINTOPOINT) {
-		sipx = (struct sockaddr_ipx *)ifa->ifa_broadaddr;
+		sipx = (struct sockaddr_ipx *)ifa->ifa_dstaddr;
 		if (sipx == NULL) {
 			memset(&null_sipx, 0, sizeof(null_sipx));
 			sipx = &null_sipx;

==== //depot/projects/wifi/sbin/ifconfig/ifconfig.8#21 (text+ko) ====

@@ -26,7 +26,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.133 2007/02/04 16:48:56 bms Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.134 2007/03/29 21:30:26 thompsa Exp $
 .\"
 .Dd February 4, 2007
 .Dt IFCONFIG 8
@@ -1341,7 +1341,7 @@
 Set the bridge priority for Spanning Tree.
 The default is 32768.
 The minimum is 0 and the maximum is 61440.
-.It Cm protocol Ar value
+.It Cm proto Ar value
 Set the Spanning Tree protocol.
 The default is rstp.
 The available options are stp and rstp.

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

@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.128 2007/02/27 17:11:18 sam Exp $";
+  "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.130 2007/03/24 20:26:54 yar Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>

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

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.44 2007/02/17 18:21:52 sam Exp $
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.45 2007/03/30 18:14:04 sam Exp $
  */
 
 /*-
@@ -2280,9 +2280,9 @@
 		ireq.i_type = IEEE80211_IOC_HIDESSID;
 		if (ioctl(s, SIOCG80211, &ireq) != -1) {
 			if (ireq.i_val)
-				LINE_CHECK("ssid HIDE");
+				LINE_CHECK("hidessid");
 			else if (verbose)
-				LINE_CHECK("ssid SHOW");
+				LINE_CHECK("-hidessid");
 		}
 
 		ireq.i_type = IEEE80211_IOC_APBRIDGE;