diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-10-21 10:07:05 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-10-21 10:07:05 +0000 |
| commit | e2904a7476a4050760669bd4fd50d9570f92d03e (patch) | |
| tree | 63955cf0a8d4043764bd85ab7abeb4bb4205410c /sys/netinet6 | |
| parent | d8e535e2ec2e712e234dc12cd5c249a00437464f (diff) | |
remove GET_TIME() wrapper
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_mroute.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_mroute.h | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index 1acfba9ff2d..ed7be150d9d 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -872,7 +872,7 @@ collate(struct timeval *t) struct timeval tp; u_long delta; - GET_TIME(tp); + microtime(&tp); if (TV_LT(*t, tp)) { @@ -1033,7 +1033,7 @@ ip6_mforward(struct ip6_hdr *ip6, struct ifnet *ifp, struct mbuf *m) #ifdef UPCALL_TIMING struct timeval tp; - GET_TIME(tp); + microtime(&tp); #endif /* UPCALL_TIMING */ mrt6stat.mrt6s_no_route++; diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h index 5c7375676f5..eb838fdd46e 100644 --- a/sys/netinet6/ip6_mroute.h +++ b/sys/netinet6/ip6_mroute.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_mroute.h,v 1.9 2013/05/02 11:54:10 mpi Exp $ */ +/* $OpenBSD: ip6_mroute.h,v 1.10 2013/10/21 10:07:04 deraadt Exp $ */ /* $KAME: ip6_mroute.h,v 1.17 2001/02/10 02:05:52 itojun Exp $ */ /* @@ -61,14 +61,6 @@ #define MRT6_PIM 107 /* enable pim code */ #define MRT6_INIT 108 /* initialize forwarder (mrt6msg) */ -#if BSD >= 199103 -#define GET_TIME(t) microtime(&t) -#elif defined(sun) -#define GET_TIME(t) uniqtime(&t) -#else -#define GET_TIME(t) ((t) = time) -#endif - /* * Types and macros for handling bitmaps with one bit per multicast interface. */ |