From owner-svn-src-all@FreeBSD.ORG  Sat Dec  4 02:04:02 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF3D5106566B;
	Sat,  4 Dec 2010 02:04:02 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CDF258FC0A;
	Sat,  4 Dec 2010 02:04:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oB42422K068422;
	Sat, 4 Dec 2010 02:04:02 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB4242ZE068420;
	Sat, 4 Dec 2010 02:04:02 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201012040204.oB4242ZE068420@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Sat, 4 Dec 2010 02:04:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216173 - head/sys/dev/e1000
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Dec 2010 02:04:03 -0000

Author: jfv
Date: Sat Dec  4 02:04:02 2010
New Revision: 216173
URL: http://svn.freebsd.org/changeset/base/216173

Log:
  Remove the bogus test in the TX context setup for IPV6,
  the size can be smaller than the constant when you are
  doing HW TAGGING, and you still need to process this
  packet in a normal way. I'm not sure where the notion
  to just return came from, but its wrong.
  
  MFC after: 3 days

Modified:
  head/sys/dev/e1000/if_igb.c

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Sat Dec  4 01:59:58 2010	(r216172)
+++ head/sys/dev/e1000/if_igb.c	Sat Dec  4 02:04:02 2010	(r216173)
@@ -3429,8 +3429,6 @@ igb_tx_ctx_setup(struct tx_ring *txr, st
 		case ETHERTYPE_IPV6:
 			ip6 = (struct ip6_hdr *)(mp->m_data + ehdrlen);
 			ip_hlen = sizeof(struct ip6_hdr);
-			if (mp->m_len < ehdrlen + ip_hlen)
-				return (FALSE);
 			ipproto = ip6->ip6_nxt;
 			type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_IPV6;
 			break;