From owner-p4-projects@FreeBSD.ORG  Mon Aug  8 20:10:30 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02EB516A47C; Mon,  8 Aug 2005 20:10:30 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 B143816A4D0
	for <perforce@freebsd.org>; Mon,  8 Aug 2005 20:10:29 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 627EE43D45
	for <perforce@freebsd.org>; Mon,  8 Aug 2005 20:10:29 +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 j78KAT7v047114
	for <perforce@freebsd.org>; Mon, 8 Aug 2005 20:10:29 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j78KATeg047108
	for perforce@freebsd.org; Mon, 8 Aug 2005 20:10:29 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 8 Aug 2005 20:10:29 GMT
Message-Id: <200508082010.j78KATeg047108@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>
Cc: 
Subject: PERFORCE change 81675 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 08 Aug 2005 20:10:30 -0000

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

Change 81675 by sam@sam_ebb on 2005/08/08 20:10:01

	fixup mis-merges

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#18 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_input.c#61 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_node.h#32 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#2 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#18 (text+ko) ====

@@ -423,11 +423,6 @@
 			ic->ic_stats.is_crypto_delkey++;
 			/* XXX recovery? */
 		}
-		/*
-		 * Clear any unicast key index -> node mapping.
-		 */
-		if ((key->wk_flags & IEEE80211_KEY_GROUP) == 0)
-			ieee80211_node_delkey(&ic->ic_sta, keyix);
 	}
 	cipher_detach(key);
 	memset(key, 0, sizeof(*key));

==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#61 (text+ko) ====

@@ -2062,13 +2062,13 @@
 			ic->ic_stats.is_rx_chanmismatch++;
 			return;
 		}
-		if (!(IEEE80211_BINTVAL_MIN <= bintval &&
-		      bintval <= IEEE80211_BINTVAL_MAX)) {
+		if (!(IEEE80211_BINTVAL_MIN <= scan.bintval &&
+		      scan.bintval <= IEEE80211_BINTVAL_MAX)) {
 			IEEE80211_DISCARD(ic,
 			    IEEE80211_MSG_ELEMID | IEEE80211_MSG_INPUT,
 			    wh, ieee80211_mgt_subtype_name[subtype >>
 				IEEE80211_FC0_SUBTYPE_SHIFT],
-			    "bogus beacon interval", bintval);
+			    "bogus beacon interval", scan.bintval);
 			ic->ic_stats.is_rx_badbintval++;
 			return;
 		}

==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#32 (text+ko) ====

@@ -224,8 +224,6 @@
 	ieee80211_scan_lock_t	nt_scanlock;	/* on nt_scangen */
 	u_int			nt_scangen;	/* gen# for timeout scan */
 	int			nt_inact_init;	/* initial node inact setting */
-	struct ieee80211_node	**nt_keyixmap;	/* key ix -> node map */
-	int			nt_keyixmax;	/* keyixmap size */
 };
 
 struct ieee80211_node *ieee80211_alloc_node(

==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#2 (text+ko) ====

@@ -125,7 +125,7 @@
 	u_int8_t	bchan;
 	u_int8_t	fhindex;
 	u_int8_t	erp;
-	u_int8_t	bintval;
+	u_int16_t	bintval;
 	u_int8_t	timoff;
 	u_int8_t	*tim;
 	u_int8_t	*tstamp;