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

John Baldwin jhb at FreeBSD.org
Fri Dec 18 16:14:31 UTC 2009


Author: jhb
Date: Fri Dec 18 16:14:31 2009
New Revision: 200671
URL: http://svn.freebsd.org/changeset/base/200671

Log:
  - Add missing newlines to some error messages.
  - Add interrupt descriptions when using mulitple MSI-X interrupts.
  
  Reviewed by:	jfv

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

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Fri Dec 18 16:13:21 2009	(r200670)
+++ head/sys/dev/e1000/if_igb.c	Fri Dec 18 16:14:31 2009	(r200671)
@@ -2121,9 +2121,10 @@ igb_allocate_msix(struct adapter *adapte
 		    igb_msix_tx, txr, &txr->tag);
 		if (error) {
 			txr->res = NULL;
-			device_printf(dev, "Failed to register TX handler");
+			device_printf(dev, "Failed to register TX handler\n");
 			return (error);
 		}
+		bus_describe_intr(dev, txr->res, txr->tag, "tx %d", i);
 		txr->msix = vector;
 		if (adapter->hw.mac.type == e1000_82575)
 			txr->eims = E1000_EICR_TX_QUEUE0 << i;
@@ -2159,9 +2160,10 @@ igb_allocate_msix(struct adapter *adapte
 		    igb_msix_rx, rxr, &rxr->tag);
 		if (error) {
 			rxr->res = NULL;
-			device_printf(dev, "Failed to register RX handler");
+			device_printf(dev, "Failed to register RX handler\n");
 			return (error);
 		}
+		bus_describe_intr(dev, rxr->res, rxr->tag, "rx %d", i);
 		rxr->msix = vector;
 		if (adapter->hw.mac.type == e1000_82575)
 			rxr->eims = E1000_EICR_RX_QUEUE0 << i;
@@ -2200,9 +2202,10 @@ igb_allocate_msix(struct adapter *adapte
 	if ((error = bus_setup_intr(dev, adapter->res,
 	    INTR_TYPE_NET | INTR_MPSAFE, NULL,
 	    igb_msix_link, adapter, &adapter->tag)) != 0) {
-		device_printf(dev, "Failed to register Link handler");
+		device_printf(dev, "Failed to register Link handler\n");
 		return (error);
 	}
+	bus_describe_intr(dev, adapter->res, adapter->tag, "link");
 	adapter->linkvec = vector;
 
 	return (0);


More information about the svn-src-head mailing list