net/ipv6: Pass net to fib6_update_sernum

Pass net namespace to fib6_update_sernum. It can not be marked const
as fib6_new_sernum will change ipv6.fib6_sernum.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 5e86fd9..f0aaf1c 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -408,7 +408,7 @@ void __net_exit fib6_notifier_exit(struct net *net);
 unsigned int fib6_tables_seq_read(struct net *net);
 int fib6_tables_dump(struct net *net, struct notifier_block *nb);
 
-void fib6_update_sernum(struct rt6_info *rt);
+void fib6_update_sernum(struct net *net, struct rt6_info *rt);
 void fib6_update_sernum_upto_root(struct net *net, struct rt6_info *rt);
 
 #ifdef CONFIG_IPV6_MULTIPLE_TABLES

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index deab2db..74d2a37 100644 (file)
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -105,9 +105,8 @@ enum {
        FIB6_NO_SERNUM_CHANGE = 0,
 };
 
-void fib6_update_sernum(struct rt6_info *rt)
+void fib6_update_sernum(struct net *net, struct rt6_info *rt)
 {
-       struct net *net = dev_net(rt->dst.dev);
        struct fib6_node *fn;
 
        fn = rcu_dereference_protected(rt->rt6i_node,

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 1d738bf..0a99cda 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -1352,7 +1352,7 @@ out:
        /* Update fn->fn_sernum to invalidate all cached dst */
        if (!err) {
                spin_lock_bh(&ort->rt6i_table->tb6_lock);
-               fib6_update_sernum(ort);
+               fib6_update_sernum(net, ort);
                spin_unlock_bh(&ort->rt6i_table->tb6_lock);
                fib6_force_start_gc(net);
        }
@@ -3786,11 +3786,11 @@ void rt6_multipath_rebalance(struct rt6_info *rt)
 static int fib6_ifup(struct rt6_info *rt, void *p_arg)
 {
        const struct arg_netdev_event *arg = p_arg;
-       const struct net *net = dev_net(arg->dev);
+       struct net *net = dev_net(arg->dev);
 
        if (rt != net->ipv6.ip6_null_entry && rt->dst.dev == arg->dev) {
                rt->rt6i_nh_flags &= ~arg->nh_flags;
-               fib6_update_sernum_upto_root(dev_net(rt->dst.dev), rt);
+               fib6_update_sernum_upto_root(net, rt);
                rt6_multipath_rebalance(rt);
        }
 
@@ -3869,7 +3869,7 @@ static int fib6_ifdown(struct rt6_info *rt, void *p_arg)
 {
        const struct arg_netdev_event *arg = p_arg;
        const struct net_device *dev = arg->dev;
-       const struct net *net = dev_net(dev);
+       struct net *net = dev_net(dev);
 
        if (rt == net->ipv6.ip6_null_entry)
                return 0;
@@ -3892,7 +3892,7 @@ static int fib6_ifdown(struct rt6_info *rt, void *p_arg)
                        }
                        rt6_multipath_nh_flags_set(rt, dev, RTNH_F_DEAD |
                                                   RTNH_F_LINKDOWN);
-                       fib6_update_sernum(rt);
+                       fib6_update_sernum(net, rt);
                        rt6_multipath_rebalance(rt);
                }
                return -2;