From owner-p4-projects@FreeBSD.ORG  Mon Dec 20 06:18:51 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8830916A4D0; Mon, 20 Dec 2004 06:18:51 +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 49F3C16A4CE
	for <perforce@freebsd.org>; Mon, 20 Dec 2004 06:18:51 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 37DB943D39
	for <perforce@freebsd.org>; Mon, 20 Dec 2004 06:18:51 +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 iBK6Ip3A013313
	for <perforce@freebsd.org>; Mon, 20 Dec 2004 06:18:51 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBK6IpGJ013310
	for perforce@freebsd.org; Mon, 20 Dec 2004 06:18:51 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 20 Dec 2004 06:18:51 GMT
Message-Id: <200412200618.iBK6IpGJ013310@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 67377 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: Mon, 20 Dec 2004 06:18:52 -0000

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

Change 67377 by sam@sam_ebb on 2004/12/20 06:17:50

	o add deftxkey pseudonym for weptxkey to be consistent with
	  what is displayed by status
	o recognize "undef" or "-" to mean set the default tx key to
	  be undefined

Affected files ...

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

Differences ...

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

@@ -265,10 +265,19 @@
 	set80211(s, IEEE80211_IOC_WEP, d, 0, NULL);
 }
 
+static int
+isundefarg(const char *arg)
+{
+	return (strcmp(arg, "-") == 0 || strncasecmp(arg, "undef", 5) == 0);
+}
+
 static void
 set80211weptxkey(const char *val, int d, int s, const struct afswtch *rafp)
 {
-	set80211(s, IEEE80211_IOC_WEPTXKEY, atoi(val)-1, 0, NULL);
+	if (isundefarg(val))
+		set80211(s, IEEE80211_IOC_WEPTXKEY, IEEE80211_KEYIX_NONE, 0, NULL);
+	else
+		set80211(s, IEEE80211_IOC_WEPTXKEY, atoi(val)-1, 0, NULL);
 }
 
 static void
@@ -1733,6 +1742,7 @@
 	DEF_CMD_ARG("wepmode",		set80211wepmode),
 	DEF_CMD("wep",		1,	set80211wep),
 	DEF_CMD("-wep",		0,	set80211wep),
+	DEF_CMD_ARG("deftxkey",		set80211weptxkey),
 	DEF_CMD_ARG("weptxkey",		set80211weptxkey),
 	DEF_CMD_ARG("wepkey",		set80211wepkey),
 	DEF_CMD_ARG("nwkey",		set80211nwkey),		/* NetBSD */