From owner-svn-src-stable@FreeBSD.ORG  Wed Dec 15 22:48:44 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 61BF3106566C;
	Wed, 15 Dec 2010 22:48:44 +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 4FB998FC12;
	Wed, 15 Dec 2010 22:48:44 +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 oBFMmivw097212;
	Wed, 15 Dec 2010 22:48:44 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBFMmijK097210;
	Wed, 15 Dec 2010 22:48:44 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201012152248.oBFMmijK097210@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Wed, 15 Dec 2010 22:48:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216465 - stable/7/sys/dev/e1000
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Dec 2010 22:48:44 -0000

Author: jfv
Date: Wed Dec 15 22:48:44 2010
New Revision: 216465
URL: http://svn.freebsd.org/changeset/base/216465

Log:
  MFC r216173
  
  Remove the test for a minimum frame size from the IPV6 TX context
  descriptor setup, when using VLANs and HW TAGGING the length of
  an ICMP6 frame will fail this test and be discarded.
  
  Approved by: re

Modified:
  stable/7/sys/dev/e1000/if_igb.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/e1000/if_igb.c
==============================================================================
--- stable/7/sys/dev/e1000/if_igb.c	Wed Dec 15 20:08:29 2010	(r216464)
+++ stable/7/sys/dev/e1000/if_igb.c	Wed Dec 15 22:48:44 2010	(r216465)
@@ -3264,8 +3264,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;