From owner-p4-projects@FreeBSD.ORG  Tue Nov 22 23:47:37 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 693A316A421; Tue, 22 Nov 2005 23:47:37 +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 424E816A41F
	for <perforce@freebsd.org>; Tue, 22 Nov 2005 23:47:37 +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 646A743D73
	for <perforce@freebsd.org>; Tue, 22 Nov 2005 23:47:30 +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 jAMNlURe091650
	for <perforce@freebsd.org>; Tue, 22 Nov 2005 23:47:30 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAMNlUIW091647
	for perforce@freebsd.org; Tue, 22 Nov 2005 23:47:30 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 22 Nov 2005 23:47:30 GMT
Message-Id: <200511222347.jAMNlUIW091647@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 87096 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: Tue, 22 Nov 2005 23:47:38 -0000

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

Change 87096 by sam@sam_ebb on 2005/11/22 23:46:35

	fix merge botch

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_node.c#65 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#65 (text+ko) ====

@@ -1832,17 +1832,6 @@
 			    keyixmax);
 	} else
 		nt->nt_keyixmap = NULL;
-	nt->nt_keyixmax = keyixmax;
-	if (nt->nt_keyixmax > 0) {
-		MALLOC(nt->nt_keyixmap, struct ieee80211_node **,
-			keyixmax * sizeof(struct ieee80211_node *),
-			M_80211_NODE, M_NOWAIT | M_ZERO);
-		if (nt->nt_keyixmap == NULL)
-			if_printf(ic->ic_ifp,
-			    "Cannot allocate key index map with %u entries\n",
-			    keyixmax);
-	} else
-		nt->nt_keyixmap = NULL;
 }
 
 static void