svn commit: r241652 - head/sys/dev/nve

[Gleb Smirnoff]

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