From owner-p4-projects@FreeBSD.ORG  Sat Dec 25 19:32:10 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B714716A4D0; Sat, 25 Dec 2004 19:32:09 +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 9427D16A4CE
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 19:32:09 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6D1DD43D1F
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 19:32:09 +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 iBPJW9gP056338
	for <perforce@freebsd.org>; Sat, 25 Dec 2004 19:32:09 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iBPJW9O3056335
	for perforce@freebsd.org; Sat, 25 Dec 2004 19:32:09 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 25 Dec 2004 19:32:09 GMT
Message-Id: <200412251932.iBPJW9O3056335@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 67689 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: Sat, 25 Dec 2004 19:32:10 -0000

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

Change 67689 by sam@sam_ebb on 2004/12/25 19:31:16

	allow the deftxkey to be set to "undefined"

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#30 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#30 (text+ko) ====

@@ -1972,7 +1972,8 @@
 		break;
 	case IEEE80211_IOC_WEPTXKEY:
 		kid = (u_int) ireq->i_val;
-		if (kid >= IEEE80211_WEP_NKID)
+		if (kid >= IEEE80211_WEP_NKID &&
+		    (u_int16_t) kid != IEEE80211_KEYIX_NONE)
 			return EINVAL;
 		ic->ic_def_txkey = kid;
 		error = ENETRESET;	/* push to hardware */