[src/trunk]: src/sys Apply some missing changes lost on the previous commit

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c65b2dc9e6ae
branches:  trunk
changeset: 965492:c65b2dc9e6ae
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Thu Sep 19 05:31:50 2019 +0000

description:
Apply some missing changes lost on the previous commit

diffstat:

 sys/netinet/ip_input.c   |   8 ++++----
 sys/netinet6/ip6_input.c |  10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (81 lines):

diff -r adab430f5742 -r c65b2dc9e6ae sys/netinet/ip_input.c
--- a/sys/netinet/ip_input.c    Thu Sep 19 04:59:42 2019 +0000
+++ b/sys/netinet/ip_input.c    Thu Sep 19 05:31:50 2019 +0000
@@ -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 @@
 
        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 @@
                return;
        }
        icmp_error(mcopy, type, code, dest, destmtu);
-       percpu_putref(ipforward_rt_percpu);
+       rtcache_percpu_putref(ipforward_rt_percpu);
 }
 
 void
diff -r adab430f5742 -r c65b2dc9e6ae sys/netinet6/ip6_input.c
--- a/sys/netinet6/ip6_input.c  Thu Sep 19 04:59:42 2019 +0000
+++ b/sys/netinet6/ip6_input.c  Thu Sep 19 05:31:50 2019 +0000
@@ -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 @@
                goto bad;
        }
 
-       ro = percpu_getref(ip6_forward_rt_percpu);
+       ro = rtcache_percpu_getref(ip6_forward_rt_percpu);
 
        /*
         * Multicast check
@@ -566,7 +566,7 @@
                        /* 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 @@
 
 bad_unref:
        rtcache_unref(rt, ro);
-       percpu_putref(ip6_forward_rt_percpu);
+       rtcache_percpu_putref(ip6_forward_rt_percpu);
 bad:
        m_freem(m);
        return;