From 9e7df381487e6e5404a19979dbb19fcfcc20aa4c Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Wed, 17 Oct 2012 21:30:16 +0000 Subject: [PATCH] Don't redefine macros defined in if.h and ethernet.h. --- sys/dev/nve/if_nvereg.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/nve/if_nvereg.h b/sys/dev/nve/if_nvereg.h index b6346690d1a..788beb14607 100644 --- a/sys/dev/nve/if_nvereg.h +++ b/sys/dev/nve/if_nvereg.h @@ -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);