ipv4: Move fib_has_custom_local_routes outside of IP_MULTIPLE_TABLES.
authorDavid S. Miller <davem@davemloft.net>
Fri, 22 Sep 2017 01:18:23 +0000 (18:18 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 22 Sep 2017 01:18:23 +0000 (18:18 -0700)
> net/ipv4/fib_frontend.c: In function 'fib_validate_source':
> net/ipv4/fib_frontend.c:411:16: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
>    if (net->ipv4.fib_has_custom_local_routes)
>                 ^
> net/ipv4/fib_frontend.c: In function 'inet_rtm_newroute':
> net/ipv4/fib_frontend.c:773:12: error: 'struct netns_ipv4' has no member named 'fib_has_custom_local_routes'
>    net->ipv4.fib_has_custom_local_routes = true;
>             ^

Fixes: 6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/netns/ipv4.h

index 20720721da4ba6f06a6d4a106d11e38997f8349c..8387f099115e5d501688ee4fa6bee2a85ec79208 100644 (file)
@@ -49,10 +49,10 @@ struct netns_ipv4 {
 #ifdef CONFIG_IP_MULTIPLE_TABLES
        struct fib_rules_ops    *rules_ops;
        bool                    fib_has_custom_rules;
-       bool                    fib_has_custom_local_routes;
        struct fib_table __rcu  *fib_main;
        struct fib_table __rcu  *fib_default;
 #endif
+       bool                    fib_has_custom_local_routes;
 #ifdef CONFIG_IP_ROUTE_CLASSID
        int                     fib_num_tclassid_users;
 #endif