From owner-svn-src-head@FreeBSD.ORG  Wed Oct 17 21:30:16 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B55A582A;
 Wed, 17 Oct 2012 21:30:16 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 9BAD28FC08;
 Wed, 17 Oct 2012 21:30:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9HLUGEr068386;
 Wed, 17 Oct 2012 21:30:16 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9HLUGHi068384;
 Wed, 17 Oct 2012 21:30:16 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201210172130.q9HLUGHi068384@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 17 Oct 2012 21:30:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241652 - head/sys/dev/nve
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 17 Oct 2012 21:30:16 -0000

Author: glebius
Date: Wed Oct 17 21:30:16 2012
New Revision: 241652
URL: http://svn.freebsd.org/changeset/base/241652

Log:
  Don't redefine macros defined in if.h and ethernet.h.

Modified:
  head/sys/dev/nve/if_nvereg.h

Modified: head/sys/dev/nve/if_nvereg.h
==============================================================================
--- head/sys/dev/nve/if_nvereg.h	Wed Oct 17 21:26:35 2012	(r241651)
+++ head/sys/dev/nve/if_nvereg.h	Wed Oct 17 21:30:16 2012	(r241652)
@@ -186,10 +186,6 @@ struct nve_type {
 #define NVE_UNLOCK(_sc)		mtx_unlock(&(_sc)->mtx)
 #define NVE_LOCK_ASSERT(_sc)	mtx_assert(&(_sc)->mtx, MA_OWNED)
 
-#define IF_Kbps(x) ((x) * 1000)			/* kilobits/sec. */
-#define IF_Mbps(x) (IF_Kbps((x) * 1000))	/* megabits/sec. */
-#define ETHER_ALIGN 2
-
 extern int ADAPTER_ReadPhy (PVOID pContext, ULONG ulPhyAddr, ULONG ulReg, ULONG *pulVal);
 extern int ADAPTER_WritePhy (PVOID pContext, ULONG ulPhyAddr, ULONG ulReg, ULONG ulVal);
 extern int ADAPTER_Init (PVOID pContext, USHORT usForcedSpeed, UCHAR ucForceDpx, UCHAR ucForceMode, UINT *puiLinkState);