Merge tag 'renesas-boards-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / route.c

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 793c0bb8c4fd9d0f8db91bc715e842ca2edc3620..6a2155b02602b100c7ce3bbfda28a38090add7a4 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1311,7 +1311,7 @@ static bool rt_cache_route(struct fib_nh *nh, struct rtable *rt)
        if (rt_is_input_route(rt)) {
                p = (struct rtable **)&nh->nh_rth_input;
        } else {
-               p = (struct rtable **)__this_cpu_ptr(nh->nh_pcpu_rth_output);
+               p = (struct rtable **)raw_cpu_ptr(nh->nh_pcpu_rth_output);
        }
        orig = *p;
 
@@ -1798,6 +1798,7 @@ local_input:
 no_route:
        RT_CACHE_STAT_INC(in_no_route);
        res.type = RTN_UNREACHABLE;
+       res.fi = NULL;
        goto local_input;
 
        /*
@@ -1939,7 +1940,7 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
                                do_cache = false;
                                goto add;
                        }
-                       prth = __this_cpu_ptr(nh->nh_pcpu_rth_output);
+                       prth = raw_cpu_ptr(nh->nh_pcpu_rth_output);
                }
                rth = rcu_dereference(*prth);
                if (rt_cache_valid(rth)) {