From owner-p4-projects@FreeBSD.ORG  Mon Nov 29 16:11: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 639A116A4D0; Mon, 29 Nov 2004 16:11:10 +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 3FBCD16A4CE
	for <perforce@freebsd.org>; Mon, 29 Nov 2004 16:11:10 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2F74C43D55
	for <perforce@freebsd.org>; Mon, 29 Nov 2004 16:11:10 +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 iATGBA4F009169
	for <perforce@freebsd.org>; Mon, 29 Nov 2004 16:11:10 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iATGB9S9009166
	for perforce@freebsd.org; Mon, 29 Nov 2004 16:11:09 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 29 Nov 2004 16:11:09 GMT
Message-Id: <200411291611.iATGB9S9009166@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 66035 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, 29 Nov 2004 16:11:10 -0000

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

Change 66035 by sam@sam_ebb on 2004/11/29 16:11:06

	o use MINCLSIZE instead of MHLEN
	o minor cleanup to assert
	o note we need to be careful when adding 4-address support

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#5 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#5 (text+ko) ====

@@ -157,10 +157,11 @@
 	 * NB: we know the mbuf routines will align the data area
 	 *     so we don't need to do anything special.
 	 */
+	/* XXX 4-address frame? */
 	len = roundup(sizeof(struct ieee80211_frame) + pktlen, 4);
-	KASSERT(len <= MCLBYTES, ("802.11 packet too large: %u", len));
-	if (len <= MHLEN) {
-		MGETHDR(m, M_NOWAIT, MT_HEADER);
+	KASSERT(len <= MCLBYTES, ("802.11 mgt frame too large: %u", len));
+	if (len < MINCLSIZE) {
+		m = m_gethdr(M_NOWAIT, MT_HEADER);
 		/*
 		 * Align the data in case additional headers are added.
 		 * This should only happen when a WEP header is added