From owner-svn-src-head@FreeBSD.ORG  Mon Mar  4 23:15:08 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 4B739471;
 Mon,  4 Mar 2013 23:15:08 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3D15B1DC;
 Mon,  4 Mar 2013 23:15:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r24NF8u4030773;
 Mon, 4 Mar 2013 23:15:08 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r24NF8rG030772;
 Mon, 4 Mar 2013 23:15:08 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201303042315.r24NF8rG030772@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Mon, 4 Mar 2013 23:15:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247823 - 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: Mon, 04 Mar 2013 23:15:08 -0000

Author: jfv
Date: Mon Mar  4 23:15:07 2013
New Revision: 247823
URL: http://svnweb.freebsd.org/changeset/base/247823

Log:
  Fix a small, but important bug, a task drain was mistakenly
  being compiled only when setting LEGACY_TX, this means you would
  not get the drain when needed on detach!!
  
  Thanks to Bryan Venteicher (bryanv@freebsd.org) for catching this
  little gremlin!! :)

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

Modified: head/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- head/sys/dev/ixgbe/ixgbe.c	Mon Mar  4 23:07:40 2013	(r247822)
+++ head/sys/dev/ixgbe/ixgbe.c	Mon Mar  4 23:15:07 2013	(r247823)
@@ -654,7 +654,7 @@ ixgbe_detach(device_t dev)
 
 	for (int i = 0; i < adapter->num_queues; i++, que++, txr++) {
 		if (que->tq) {
-#ifdef IXGBE_LEGACY_TX
+#ifndef IXGBE_LEGACY_TX
 			taskqueue_drain(que->tq, &txr->txq_task);
 #endif
 			taskqueue_drain(que->tq, &que->que_task);