CVS commit: src/sys

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Thu Sep 19 05:31:50 UTC 2019

Modified Files:
        src/sys/netinet: ip_input.c
        src/sys/netinet6: ip6_input.c

Log Message:
Apply some missing changes lost on the previous commit


To generate a diff of this commit:
cvs rdiff -u -r1.391 -r1.392 src/sys/netinet/ip_input.c
cvs rdiff -u -r1.210 -r1.211 src/sys/netinet6/ip6_input.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/netinet/ip_input.c
diff -u src/sys/netinet/ip_input.c:1.391 src/sys/netinet/ip_input.c:1.392
--- src/sys/netinet/ip_input.c:1.391	Thu Sep 19 04:08:29 2019
+++ src/sys/netinet/ip_input.c	Thu Sep 19 05:31:50 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_input.c,v 1.391 2019/09/19 04:08:29 ozaki-r Exp $	*/
+/*	$NetBSD: ip_input.c,v 1.392 2019/09/19 05:31:50 ozaki-r Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.391 2019/09/19 04:08:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.392 2019/09/19 05:31:50 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1369,7 +1369,7 @@ ip_forward(struct mbuf *m, int srcrt, st
 
 	sockaddr_in_init(&u.dst4, &ip->ip_dst, 0);
 
-	ro = percpu_getref(ipforward_rt_percpu);
+	ro = rtcache_percpu_getref(ipforward_rt_percpu);
 	rt = rtcache_lookup(ro, &u.dst);
 	if (rt == NULL) {
 		rtcache_percpu_putref(ipforward_rt_percpu);
@@ -1497,7 +1497,7 @@ error:
 		return;
 	}
 	icmp_error(mcopy, type, code, dest, destmtu);
-	percpu_putref(ipforward_rt_percpu);
+	rtcache_percpu_putref(ipforward_rt_percpu);
 }
 
 void

Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.210 src/sys/netinet6/ip6_input.c:1.211
--- src/sys/netinet6/ip6_input.c:1.210	Thu Sep 19 04:08:29 2019
+++ src/sys/netinet6/ip6_input.c	Thu Sep 19 05:31:50 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_input.c,v 1.210 2019/09/19 04:08:29 ozaki-r Exp $	*/
+/*	$NetBSD: ip6_input.c,v 1.211 2019/09/19 05:31:50 ozaki-r Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.210 2019/09/19 04:08:29 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.211 2019/09/19 05:31:50 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_gateway.h"
@@ -405,7 +405,7 @@ ip6_input(struct mbuf *m, struct ifnet *
 		goto bad;
 	}
 
-	ro = percpu_getref(ip6_forward_rt_percpu);
+	ro = rtcache_percpu_getref(ip6_forward_rt_percpu);
 
 	/*
 	 * Multicast check
@@ -566,7 +566,7 @@ hbhcheck:
 			/* m already freed */
 			in6_ifstat_inc(rcvif, ifs6_in_discard);
 			rtcache_unref(rt, ro);
-			percpu_putref(ip6_forward_rt_percpu);
+			rtcache_percpu_putref(ip6_forward_rt_percpu);
 			return;
 		}
 
@@ -764,7 +764,7 @@ hbhcheck:
 
 bad_unref:
 	rtcache_unref(rt, ro);
-	percpu_putref(ip6_forward_rt_percpu);
+	rtcache_percpu_putref(ip6_forward_rt_percpu);
 bad:
 	m_freem(m);
 	return;