Skip to content

Commit

Permalink
[NETNS]: Enable routing configuration in non-initial namespace.
Browse files Browse the repository at this point in the history
I.e. remove the net != &init_net checks from the places, that now can
handle other-than-init net namespace.

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 226b0b4 commit 8cced9e
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions net/ipv4/fib_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -572,9 +572,6 @@ static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *ar
struct fib_table *tb;
int err;

if (net != &init_net)
return -EINVAL;

err = rtm_to_fib_config(net, skb, nlh, &cfg);
if (err < 0)
goto errout;
Expand All @@ -597,9 +594,6 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *ar
struct fib_table *tb;
int err;

if (net != &init_net)
return -EINVAL;

err = rtm_to_fib_config(net, skb, nlh, &cfg);
if (err < 0)
goto errout;
Expand All @@ -625,9 +619,6 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
struct hlist_head *head;
int dumped = 0;

if (net != &init_net)
return 0;

if (nlmsg_len(cb->nlh) >= sizeof(struct rtmsg) &&
((struct rtmsg *) nlmsg_data(cb->nlh))->rtm_flags & RTM_F_CLONED)
return ip_rt_dump(skb, cb);
Expand Down Expand Up @@ -934,9 +925,6 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
struct net_device *dev = ptr;
struct in_device *in_dev = __in_dev_get_rtnl(dev);

if (dev->nd_net != &init_net)
return NOTIFY_DONE;

if (event == NETDEV_UNREGISTER) {
fib_disable_ip(dev, 2);
return NOTIFY_DONE;
Expand Down Expand Up @@ -1016,10 +1004,6 @@ static int __net_init fib_net_init(struct net *net)
{
int error;

error = 0;
if (net != &init_net)
goto out;

error = ip_fib_net_init(net);
if (error < 0)
goto out;
Expand Down

0 comments on commit 8cced9e

Please sign in to comment.