From owner-p4-projects@FreeBSD.ORG  Tue May 17 23:38:50 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 43F6C16A4D1; Tue, 17 May 2005 23:38:50 +0000 (GMT)
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 2039D16A4CE
	for <perforce@freebsd.org>; Tue, 17 May 2005 23:38:50 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F051C43DCA
	for <perforce@freebsd.org>; Tue, 17 May 2005 23:38:49 +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 j4HNckog061057
	for <perforce@freebsd.org>; Tue, 17 May 2005 23:38:46 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4HNcjSS061054
	for perforce@freebsd.org; Tue, 17 May 2005 23:38:45 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 17 May 2005 23:38:45 GMT
Message-Id: <200505172338.j4HNcjSS061054@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>
Subject: PERFORCE change 77115 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 17 May 2005 23:38:50 -0000

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

Change 77115 by sam@sam_ebb on 2005/05/17 23:37:55

	o enable/disable wds for sta mode
	o use the command line usage when showing hidessid status

Affected files ...

.. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#4 edit

Differences ...

==== //depot/projects/vap/sbin/ifconfig/ifieee80211.c#4 (text+ko) ====

@@ -1179,6 +1179,12 @@
 #undef iseq
 }
 
+static void
+set80211wds(const char *val, int d, int s, const struct afswtch *rafp)
+{
+	set80211(s, IEEE80211_IOC_WDS, d, 0, NULL);
+}
+
 static enum ieee80211_opmode
 get80211opmode(int s)
 {
@@ -1623,9 +1629,9 @@
 		ireq.i_type = IEEE80211_IOC_HIDESSID;
 		if (ioctl(s, SIOCG80211, &ireq) != -1) {
 			if (ireq.i_val)
-				LINE_CHECK("%cssid HIDE", spacer);
+				LINE_CHECK("%chidessid", spacer);
 			else if (verbose)
-				LINE_CHECK("%cssid SHOW", spacer);
+				LINE_CHECK("%c-hidessid", spacer);
 		}
 
 		ireq.i_type = IEEE80211_IOC_APBRIDGE;
@@ -1680,6 +1686,13 @@
 						spacer, ireq.i_val);
 			}
 		}
+		ireq.i_type = IEEE80211_IOC_WDS;
+		if (ioctl(s, SIOCG80211, &ireq) != -1) {
+			if (ireq.i_val)
+				LINE_CHECK("%cwds", spacer);
+			else if (verbose)
+				LINE_CHECK("%c-wds", spacer);
+		}
 	}
 	ireq.i_type = IEEE80211_IOC_BEACON_INTERVAL;
 	if (ioctl(s, SIOCG80211, &ireq) != -1) {
@@ -1905,6 +1918,8 @@
 	DEF_CMD("-bgscan",	0,	set80211bgscan),
 	DEF_CMD_ARG("bgscanidle",	set80211bgscanidle),
 	DEF_CMD_ARG("bgscanintvl",	set80211bgscanintvl),
+	DEF_CMD("wds",		1,	set80211wds),
+	DEF_CMD("-wds",		0,	set80211wds),
 };
 static struct afswtch af_ieee80211 = {
 	.af_name	= "af_ieee80211",