From owner-svn-src-head@FreeBSD.ORG  Wed Oct 31 18:16:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D6616EB8;
 Wed, 31 Oct 2012 18:16:42 +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 BF2AD8FC0A;
 Wed, 31 Oct 2012 18:16:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9VIGgmH003170;
 Wed, 31 Oct 2012 18:16:42 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9VIGgxA003166;
 Wed, 31 Oct 2012 18:16:42 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201210311816.q9VIGgxA003166@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Wed, 31 Oct 2012 18:16:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242403 - head/sys/dev/ixgbe
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Oct 2012 18:16:42 -0000

Author: jfv
Date: Wed Oct 31 18:16:42 2012
New Revision: 242403
URL: http://svn.freebsd.org/changeset/base/242403

Log:
  Correct code that was lost somewhere in the past,
  this was designed to keep duplicate null vlan tags from
  being added. When doing vlans purely via the switch
  this problem will occur. Reported by external customer.

Modified:
  head/sys/dev/ixgbe/ixgbe.c

Modified: head/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.c	Wed Oct 31 18:07:18 2012	(r242402)
+++ head/sys/dev/ixgbe/ixgbe.c	Wed Oct 31 18:16:42 2012	(r242403)
@@ -4688,7 +4688,7 @@ ixgbe_rxeof(struct ix_queue *que, int co
 				/* first desc of a non-ps chain */
 				sendmp->m_flags |= M_PKTHDR;
 				sendmp->m_pkthdr.len = mp->m_len;
-				if (staterr & IXGBE_RXD_STAT_VP) {
+                                if (vtag) {
 					sendmp->m_pkthdr.ether_vtag = vtag;
 					sendmp->m_flags |= M_VLANTAG;
 				}