Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Nov 2005 23:47:30 GMT
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 87096 for review
Message-ID:  <200511222347.jAMNlUIW091647@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511222347.jAMNlUIW091647>