dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

[NETNS]: Replace init_net with the correct context in fib_frontend.c

Browse source 
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>
This commit is contained in:
Denis V. Lunev 2008-01-10 03:30:24 -08:00 committed by David S. Miller
parent 1bad118a33
commit 226b0b4a51
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/ipv4/fib_frontend.c
View file

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