Skip to content

Commit

Permalink
[NETNS]: Replace init_net with the correct context in fib_frontend.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Denis V. Lunev authored and David S. Miller committed Jan 28, 2008
1 parent 1bad118 commit 226b0b4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/ipv4/fib_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -794,15 +794,15 @@ 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.
First of all, we scan fib_info list searching
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
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 226b0b4

Please sign in to comment.