From owner-svn-src-projects@FreeBSD.ORG  Wed Apr 29 16:31:05 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D0A82433;
 Wed, 29 Apr 2015 16:31:05 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BF45715C5;
 Wed, 29 Apr 2015 16:31:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3TGV5gG095494;
 Wed, 29 Apr 2015 16:31:05 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3TGV5HT095491;
 Wed, 29 Apr 2015 16:31:05 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201504291631.t3TGV5HT095491@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Wed, 29 Apr 2015 16:31:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r282234 - projects/em_mq/sys/dev/e1000
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Apr 2015 16:31:05 -0000

Author: sbruno
Date: Wed Apr 29 16:31:04 2015
New Revision: 282234
URL: https://svnweb.freebsd.org/changeset/base/282234

Log:
  bus_describe_intr() will stop at the first whitespace it encounters, remove space
  so the intr thread is identified correctly.
  
  Remove stray comment.

Modified:
  projects/em_mq/sys/dev/e1000/if_em.c
  projects/em_mq/sys/dev/e1000/if_em.h

Modified: projects/em_mq/sys/dev/e1000/if_em.c
==============================================================================
--- projects/em_mq/sys/dev/e1000/if_em.c	Wed Apr 29 16:15:38 2015	(r282233)
+++ projects/em_mq/sys/dev/e1000/if_em.c	Wed Apr 29 16:31:04 2015	(r282234)
@@ -2580,7 +2580,7 @@ em_allocate_msix(struct adapter *adapter
 			return (error);
 		}
 #if __FreeBSD_version >= 800504
-		bus_describe_intr(dev, rxr->res, rxr->tag, "rx %d", i);
+		bus_describe_intr(dev, rxr->res, rxr->tag, "rx%d", i);
 #endif
 		rxr->msix = vector;
 

Modified: projects/em_mq/sys/dev/e1000/if_em.h
==============================================================================
--- projects/em_mq/sys/dev/e1000/if_em.h	Wed Apr 29 16:15:38 2015	(r282233)
+++ projects/em_mq/sys/dev/e1000/if_em.h	Wed Apr 29 16:31:04 2015	(r282234)
@@ -407,7 +407,6 @@ struct adapter {
 	eventhandler_tag vlan_detach;
 
 	u16	num_vlans;
-	/* Allow number of tx queues != num of rx_queues */
 	u8	num_queues;
 
         /*