From owner-p4-projects@FreeBSD.ORG  Sun Dec  9 01:30:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1B11516A420; Sun,  9 Dec 2007 01:30:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A71C316A418
	for <perforce@freebsd.org>; Sun,  9 Dec 2007 01:30:13 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 977CE13C455
	for <perforce@freebsd.org>; Sun,  9 Dec 2007 01:30:13 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB91UDE9056060
	for <perforce@freebsd.org>; Sun, 9 Dec 2007 01:30:13 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB91UDr1056055
	for perforce@freebsd.org; Sun, 9 Dec 2007 01:30:13 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 9 Dec 2007 01:30:13 GMT
Message-Id: <200712090130.lB91UDr1056055@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130522 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: Sun, 09 Dec 2007 01:30:14 -0000

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

Change 130522 by kmacy@kmacy_home:ethng on 2007/12/09 01:29:35

	fix contiguous pkthdr check - still need to make this more
	robust before pulling in to CVS

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#36 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_sge.c#36 (text+ko) ====

@@ -1362,7 +1362,7 @@
 		
 		return (0);		
 	} else if (tso_info) {
-		int eth_type;
+		int undersized, eth_type;
 		struct cpl_tx_pkt_lso *hdr = (struct cpl_tx_pkt_lso *)txd;
 		struct ip *ip;
 		struct tcphdr *tcp;
@@ -1381,7 +1381,11 @@
 		hdr->len = htonl(mlen | 0x80000000);
 
 		DPRINTF("tso buf len=%d\n", mlen);
-		if (__predict_false(tmpmi->mi_len < TCPPKTHDRSIZE)) {
+		undersized = (((tmpmi->mi_len < TCPPKTHDRSIZE) &&
+			(m0->m_flags & M_VLANTAG)) ||
+		    (tmpmi->mi_len < TCPPKTHDRSIZE - ETHER_VLAN_ENCAP_LEN));
+
+		if (__predict_false(undersized)) {
 			pkthdr = tmp;
 			dump_mi(mi);
 			panic("discontig packet - fixxorz");