From owner-p4-projects@FreeBSD.ORG  Tue Nov 23 03:44:40 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F076616A4D0; Tue, 23 Nov 2004 03:44:39 +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 B197F16A4CE
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 03:44:39 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9E30B43D60
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 03:44:39 +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 iAN3idH2002078
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 03:44:39 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iAN3idPC002075
	for perforce@freebsd.org; Tue, 23 Nov 2004 03:44:39 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 23 Nov 2004 03:44:39 GMT
Message-Id: <200411230344.iAN3idPC002075@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 65682 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: Tue, 23 Nov 2004 03:44:40 -0000

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

Change 65682 by sam@sam_ebb on 2004/11/23 03:44:16

	correct packet length calculation for the case where
	data padding is done

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#25 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#25 (text+ko) ====

@@ -2716,7 +2716,11 @@
 	iswep = wh->i_fc[1] & IEEE80211_FC1_WEP;
 	ismcast = IEEE80211_IS_MULTICAST(wh->i_addr1);
 	hdrlen = ieee80211_anyhdrsize(wh);
-	pktlen = m0->m_pkthdr.len;
+	/*
+	 * Packet length must not include by any
+	 * pad bytes; deduct it here.
+	 */
+	pktlen = m0->m_pkthdr.len - (hdrlen & 3);
 
 	if (iswep) {
 		const struct ieee80211_cipher *cip;