svn commit: r194979 - head/sys/dev/e1000

[Jack F Vogel]

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 */