Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / include / net / ip6_fib.h

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index c979c878df1c0923e803e73ad426a90fbe5d0668..1a88008cc6f5e14a788491f62ae3c15e47b62c16 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -170,7 +170,7 @@ static inline void rt6_update_expires(struct rt6_info *rt0, int timeout)
 static inline u32 rt6_get_cookie(const struct rt6_info *rt)
 {
        if (rt->rt6i_flags & RTF_PCPU ||
-           (unlikely(rt->dst.flags & DST_NOCACHE) && rt->dst.from))
+           (unlikely(!list_empty(&rt->rt6i_uncached)) && rt->dst.from))
                rt = (struct rt6_info *)(rt->dst.from);
 
        return rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;
@@ -277,7 +277,8 @@ void fib6_clean_all(struct net *net, int (*func)(struct rt6_info *, void *arg),
                    void *arg);
 
 int fib6_add(struct fib6_node *root, struct rt6_info *rt,
-            struct nl_info *info, struct mx6_config *mxc);
+            struct nl_info *info, struct mx6_config *mxc,
+            struct netlink_ext_ack *extack);
 int fib6_del(struct rt6_info *rt, struct nl_info *info);
 
 void inet6_rt_notify(int event, struct rt6_info *rt, struct nl_info *info,