Module Name: src
Committed By: ozaki-r
Date: Mon Oct 5 04:15:42 UTC 2015
Modified Files:
src/sys/netinet6: nd6_rtr.c
Log Message:
Use satosin6 instead of its own macro
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/netinet6/nd6_rtr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.103 src/sys/netinet6/nd6_rtr.c:1.104
--- src/sys/netinet6/nd6_rtr.c:1.103 Mon Aug 24 09:45:29 2015
+++ src/sys/netinet6/nd6_rtr.c Mon Oct 5 04:15:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6_rtr.c,v 1.103 2015/08/24 09:45:29 ozaki-r Exp $ */
+/* $NetBSD: nd6_rtr.c,v 1.104 2015/10/05 04:15:42 ozaki-r Exp $ */
/* $KAME: nd6_rtr.c,v 1.95 2001/02/07 08:09:47 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.103 2015/08/24 09:45:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.104 2015/10/05 04:15:42 ozaki-r Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2097,13 +2097,12 @@ rt6_flush(struct in6_addr *gateway, stru
static int
rt6_deleteroute(struct rtentry *rt, void *arg)
{
-#define SIN6(s) ((struct sockaddr_in6 *)s)
struct in6_addr *gate = (struct in6_addr *)arg;
if (rt->rt_gateway == NULL || rt->rt_gateway->sa_family != AF_INET6)
return (0);
- if (!IN6_ARE_ADDR_EQUAL(gate, &SIN6(rt->rt_gateway)->sin6_addr))
+ if (!IN6_ARE_ADDR_EQUAL(gate, &satosin6(rt->rt_gateway)->sin6_addr))
return (0);
/*
@@ -2123,7 +2122,6 @@ rt6_deleteroute(struct rtentry *rt, void
return (rtrequest(RTM_DELETE, rt_getkey(rt), rt->rt_gateway,
rt_mask(rt), rt->rt_flags, NULL));
-#undef SIN6
}
int
