CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Mon Aug 24 09:45:29 UTC 2015

Modified Files:
        src/sys/netinet6: icmp6.c nd6_rtr.c

Log Message:
Change 0 to NULL for rtrequest's last argument (struct rtentry **ret_nrt)


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/sys/netinet6/icmp6.c
cvs rdiff -u -r1.102 -r1.103 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/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.173 src/sys/netinet6/icmp6.c:1.174
--- src/sys/netinet6/icmp6.c:1.173	Fri Aug  7 08:11:33 2015
+++ src/sys/netinet6/icmp6.c	Mon Aug 24 09:45:29 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: icmp6.c,v 1.173 2015/08/07 08:11:33 ozaki-r Exp $	*/
+/*	$NetBSD: icmp6.c,v 1.174 2015/08/24 09:45:29 ozaki-r Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.173 2015/08/07 08:11:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.174 2015/08/24 09:45:29 ozaki-r Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -2717,7 +2717,7 @@ icmp6_mtudisc_timeout(struct rtentry *rt
 	if ((rt->rt_flags & (RTF_DYNAMIC | RTF_HOST)) ==
 	    (RTF_DYNAMIC | RTF_HOST)) {
 		rtrequest((int) RTM_DELETE, rt_getkey(rt),
-		    rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0);
+		    rt->rt_gateway, rt_mask(rt), rt->rt_flags, NULL);
 	} else {
 		if (!(rt->rt_rmx.rmx_locks & RTV_MTU))
 			rt->rt_rmx.rmx_mtu = 0;
@@ -2732,7 +2732,7 @@ icmp6_redirect_timeout(struct rtentry *r
 	if ((rt->rt_flags & (RTF_GATEWAY | RTF_DYNAMIC | RTF_HOST)) ==
 	    (RTF_GATEWAY | RTF_DYNAMIC | RTF_HOST)) {
 		rtrequest((int) RTM_DELETE, rt_getkey(rt),
-		    rt->rt_gateway, rt_mask(rt), rt->rt_flags, 0);
+		    rt->rt_gateway, rt_mask(rt), rt->rt_flags, NULL);
 	}
 }
 

Index: src/sys/netinet6/nd6_rtr.c
diff -u src/sys/netinet6/nd6_rtr.c:1.102 src/sys/netinet6/nd6_rtr.c:1.103
--- src/sys/netinet6/nd6_rtr.c:1.102	Fri Aug  7 08:11:33 2015
+++ src/sys/netinet6/nd6_rtr.c	Mon Aug 24 09:45:29 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_rtr.c,v 1.102 2015/08/07 08:11:33 ozaki-r Exp $	*/
+/*	$NetBSD: nd6_rtr.c,v 1.103 2015/08/24 09:45:29 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.102 2015/08/07 08:11:33 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_rtr.c,v 1.103 2015/08/24 09:45:29 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2122,7 +2122,7 @@ rt6_deleteroute(struct rtentry *rt, void
 		return (0);
 
 	return (rtrequest(RTM_DELETE, rt_getkey(rt), rt->rt_gateway,
-	    rt_mask(rt), rt->rt_flags, 0));
+	    rt_mask(rt), rt->rt_flags, NULL));
 #undef SIN6
 }