Merge branch 'akpm' (Fixups from Andrew)

[firefly-linux-kernel-4.4.55.git] / include / net / route.h

diff --git a/include/net/route.h b/include/net/route.h
index 776a27f1ab78ef5a385ef8b8d2f21b9e0101e115..bc40b633a5c4dc0e763c5c8c4ff123135160dc04 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -48,7 +48,8 @@ struct rtable {
        int                     rt_genid;
        unsigned int            rt_flags;
        __u16                   rt_type;
-       __u16                   rt_is_input;
+       __u8                    rt_is_input;
+       __u8                    rt_uses_gateway;
 
        int                     rt_iif;
 
@@ -108,7 +109,7 @@ extern struct ip_rt_acct __percpu *ip_rt_acct;
 
 struct in_device;
 extern int             ip_rt_init(void);
-extern void            rt_cache_flush(struct net *net, int how);
+extern void            rt_cache_flush(struct net *net);
 extern void            rt_flush_dev(struct net_device *dev);
 extern struct rtable *__ip_route_output_key(struct net *, struct flowi4 *flp);
 extern struct rtable *ip_route_output_flow(struct net *, struct flowi4 *flp,