]> err.no Git - linux-2.6/commitdiff
[NETNS]: Replace init_net with the correct context in fib_frontend.c
authorDenis V. Lunev <den@openvz.org>
Thu, 10 Jan 2008 11:30:24 +0000 (03:30 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Jan 2008 23:01:34 +0000 (15:01 -0800)
Acked-by: Benjamin Thery <benjamin.thery@bull.net>
Acked-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/fib_frontend.c

index 15909a9fa9b2f855a0c95729f1119002dd6e7b9b..82109f13d57be018f0ef75a729735bb7e0604a07 100644 (file)
@@ -604,7 +604,7 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *ar
        if (err < 0)
                goto errout;
 
-       tb = fib_new_table(&init_net, cfg.fc_table);
+       tb = fib_new_table(net, cfg.fc_table);
        if (tb == NULL) {
                err = -ENOBUFS;
                goto errout;
@@ -794,7 +794,7 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa)
                fib_magic(RTM_DELROUTE, RTN_LOCAL, ifa->ifa_local, 32, prim);
 
                /* Check, that this local address finally disappeared. */
-               if (inet_addr_type(&init_net, ifa->ifa_local) != RTN_LOCAL) {
+               if (inet_addr_type(dev->nd_net, ifa->ifa_local) != RTN_LOCAL) {
                        /* And the last, but not the least thing.
                           We must flush stray FIB entries.
 
@@ -802,7 +802,7 @@ static void fib_del_ifaddr(struct in_ifaddr *ifa)
                           for stray nexthop entries, then ignite fib_flush.
                        */
                        if (fib_sync_down(ifa->ifa_local, NULL, 0))
-                               fib_flush(&init_net);
+                               fib_flush(dev->nd_net);
                }
        }
 #undef LOCAL_OK
@@ -897,7 +897,7 @@ static void nl_fib_lookup_exit(struct net *net)
 static void fib_disable_ip(struct net_device *dev, int force)
 {
        if (fib_sync_down(0, dev, force))
-               fib_flush(&init_net);
+               fib_flush(dev->nd_net);
        rt_cache_flush(0);
        arp_ifdown(dev);
 }