From owner-p4-projects@FreeBSD.ORG  Tue Jan 27 16:15:18 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BAA4316A4D7; Tue, 27 Jan 2004 16:15:17 -0800 (PST)
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 8D95316A4D0
	for <perforce@freebsd.org>; Tue, 27 Jan 2004 16:15:17 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AF6F643D39
	for <perforce@freebsd.org>; Tue, 27 Jan 2004 16:14:59 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0S0Ex0B054106
	for <perforce@freebsd.org>; Tue, 27 Jan 2004 16:14:59 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0S0ExMJ054102
	for perforce@freebsd.org; Tue, 27 Jan 2004 16:14:59 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 27 Jan 2004 16:14:59 -0800 (PST)
Message-Id: <200401280014.i0S0ExMJ054102@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 46025 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: Wed, 28 Jan 2004 00:15:18 -0000

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

Change 46025 by sam@sam_ebb on 2004/01/27 16:14:29

	correct assertion on beacon frame length: ieee80211_getmgtframe
	allocates space for the 802.11 header so it must be included in
	the calculations

Affected files ...

.. //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#8 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/net80211/ieee80211_output.c#8 (text+ko) ====

@@ -705,9 +705,9 @@
 	}
 	frm = ieee80211_add_xrates(frm, rs);
 	m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *);
-	KASSERT(m->m_pkthdr.len <= pktlen,
+	KASSERT(m->m_pkthdr.len <= pktlen + sizeof(struct ieee80211_frame),
 		("beacon bigger than expected, len %u calculated %u",
-		m->m_pkthdr.len, pktlen));
+		m->m_pkthdr.len, pktlen + sizeof(struct ieee80211_frame)));
 	return m;
 }