From owner-svn-src-stable-10@FreeBSD.ORG  Tue Apr  7 17:07:31 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BD2BE6F2;
 Tue,  7 Apr 2015 17:07:31 +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 A7C112EC;
 Tue,  7 Apr 2015 17:07:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t37H7VPV035389;
 Tue, 7 Apr 2015 17:07:31 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t37H7V3k035386;
 Tue, 7 Apr 2015 17:07:31 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201504071707.t37H7V3k035386@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 7 Apr 2015 17:07:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r281211 - in stable/10/sys/dev/cxgbe: . tom
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Apr 2015 17:07:31 -0000

Author: np
Date: Tue Apr  7 17:07:30 2015
New Revision: 281211
URL: https://svnweb.freebsd.org/changeset/base/281211

Log:
  MFC r275733:
  
  Move KTR_CXGBE from t4_tom.h to adapter.h so that the base if_cxgbe
  code can use it too.

Modified:
  stable/10/sys/dev/cxgbe/adapter.h
  stable/10/sys/dev/cxgbe/tom/t4_tom.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/cxgbe/adapter.h
==============================================================================
--- stable/10/sys/dev/cxgbe/adapter.h	Tue Apr  7 16:48:23 2015	(r281210)
+++ stable/10/sys/dev/cxgbe/adapter.h	Tue Apr  7 17:07:30 2015	(r281211)
@@ -51,6 +51,7 @@
 #include "common/t4_msg.h"
 #include "firmware/t4fw_interface.h"
 
+#define KTR_CXGBE	KTR_SPARE3
 MALLOC_DECLARE(M_CXGBE);
 #define CXGBE_UNIMPLEMENTED(s) \
     panic("%s (%s, line %d) not implemented yet.", s, __FILE__, __LINE__)

Modified: stable/10/sys/dev/cxgbe/tom/t4_tom.h
==============================================================================
--- stable/10/sys/dev/cxgbe/tom/t4_tom.h	Tue Apr  7 16:48:23 2015	(r281210)
+++ stable/10/sys/dev/cxgbe/tom/t4_tom.h	Tue Apr  7 17:07:30 2015	(r281211)
@@ -31,7 +31,6 @@
 #ifndef __T4_TOM_H__
 #define __T4_TOM_H__
 
-#define KTR_CXGBE	KTR_SPARE3
 #define LISTEN_HASH_SIZE 32
 
 /*