From owner-svn-src-all@FreeBSD.ORG  Wed Apr 10 17:51:40 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 106151AB;
 Wed, 10 Apr 2013 17:51:40 +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 03F84E49;
 Wed, 10 Apr 2013 17:51:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3AHpdnI017128;
 Wed, 10 Apr 2013 17:51:39 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3AHpdJH017127;
 Wed, 10 Apr 2013 17:51:39 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201304101751.r3AHpdJH017127@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Wed, 10 Apr 2013 17:51:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249339 - head/sys/dev/e1000
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 10 Apr 2013 17:51:40 -0000

Author: jfv
Date: Wed Apr 10 17:51:39 2013
New Revision: 249339
URL: http://svnweb.freebsd.org/changeset/base/249339

Log:
  Simplify allocate_legacy code, txr pointer was breaking LEGACY compile,
  thanks to Nick Rogers for pointing this out.

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

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Wed Apr 10 17:51:15 2013	(r249338)
+++ head/sys/dev/e1000/if_igb.c	Wed Apr 10 17:51:39 2013	(r249339)
@@ -2474,7 +2474,6 @@ igb_allocate_legacy(struct adapter *adap
 {
 	device_t		dev = adapter->dev;
 	struct igb_queue	*que = adapter->queues;
-	struct tx_ring		*txr = adapter->tx_rings;
 	int			error, rid = 0;
 
 	/* Turn off all interrupts */
@@ -2494,7 +2493,7 @@ igb_allocate_legacy(struct adapter *adap
 	}
 
 #ifndef IGB_LEGACY_TX
-	TASK_INIT(&txr->txq_task, 0, igb_deferred_mq_start, txr);
+	TASK_INIT(&que->txr->txq_task, 0, igb_deferred_mq_start, que->txr);
 #endif
 
 	/*