Date: Wed, 17 Oct 2012 21:30:16 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r241652 - head/sys/dev/nve Message-ID: <201210172130.q9HLUGHi068384@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210172130.q9HLUGHi068384>