From owner-svn-src-all@FreeBSD.ORG  Thu Jun 25 17:21:13 2009
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 000B9106566C;
	Thu, 25 Jun 2009 17:21:12 +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 E2B938FC16;
	Thu, 25 Jun 2009 17:21:12 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5PHLCHQ058287;
	Thu, 25 Jun 2009 17:21:12 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5PHLC3d058285;
	Thu, 25 Jun 2009 17:21:12 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <200906251721.n5PHLC3d058285@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Thu, 25 Jun 2009 17:21:12 +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: r194979 - 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: Thu, 25 Jun 2009 17:21:13 -0000

Author: jfv
Date: Thu Jun 25 17:21:12 2009
New Revision: 194979
URL: http://svn.freebsd.org/changeset/base/194979

Log:
  Change intr_bind to bus_bind_intr, also limit this to
  multiqueue setup which is not the shipping default for
  igb (its set to 1).

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

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Thu Jun 25 17:16:26 2009	(r194978)
+++ head/sys/dev/e1000/if_igb.c	Thu Jun 25 17:21:12 2009	(r194979)
@@ -2189,13 +2189,12 @@ igb_allocate_msix(struct adapter *adapte
 			txr->eims = E1000_EICR_TX_QUEUE0 << i;
 		else
 			txr->eims = 1 << vector;
-#if defined(__i386__) || defined(__amd64__)
 		/*
 		** Bind the msix vector, and thus the
 		** ring to the corresponding cpu.
 		*/
-		intr_bind(rman_get_start(txr->res), i);
-#endif
+		if (adapter->num_queues > 1)
+			bus_bind_intr(dev, txr->res, i);
 	}
 
 	/* RX Setup */
@@ -2226,7 +2225,6 @@ igb_allocate_msix(struct adapter *adapte
 			rxr->eims = 1 << vector;
 		/* Get a mask for local timer */
 		adapter->rx_mask |= rxr->eims;
-#if defined(__i386__) || defined(__amd64__)
 		/*
 		** Bind the msix vector, and thus the
 		** ring to the corresponding cpu.
@@ -2234,8 +2232,8 @@ igb_allocate_msix(struct adapter *adapte
 		** bound to each CPU, limited by the MSIX
 		** vectors.
 		*/
-		intr_bind(rman_get_start(rxr->res), i);
-#endif
+		if (adapter->num_queues > 1)
+			bus_bind_intr(dev, rxr->res, i);
 	}
 
 	/* And Link */