From owner-svn-src-head@FreeBSD.ORG  Fri Dec 18 16:14:31 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B4A39106566C;
	Fri, 18 Dec 2009 16:14:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A40528FC19;
	Fri, 18 Dec 2009 16:14:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBIGEVTX097559;
	Fri, 18 Dec 2009 16:14:31 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBIGEVkL097557;
	Fri, 18 Dec 2009 16:14:31 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200912181614.nBIGEVkL097557@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 18 Dec 2009 16:14:31 +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: r200671 - head/sys/dev/e1000
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 18 Dec 2009 16:14:31 -0000

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);