mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[NETNS]: Enable routing configuration in non-initial namespace.

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

16
net/ipv4/fib_frontend.c
View file

@ -572,9 +572,6 @@ static int inet_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *ar
struct fib_table *tb; struct fib_table *tb;
int err; int err;
if (net != &init_net)
return -EINVAL;
err = rtm_to_fib_config(net, skb, nlh, &cfg); err = rtm_to_fib_config(net, skb, nlh, &cfg);
if (err < 0) if (err < 0)
goto errout; goto errout;
@ -597,9 +594,6 @@ static int inet_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *ar
struct fib_table *tb; struct fib_table *tb;
int err; int err;
if (net != &init_net)
return -EINVAL;
err = rtm_to_fib_config(net, skb, nlh, &cfg); err = rtm_to_fib_config(net, skb, nlh, &cfg);
if (err < 0) if (err < 0)
goto errout; goto errout;
@ -625,9 +619,6 @@ static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
struct hlist_head *head; struct hlist_head *head;
int dumped = 0; int dumped = 0;
if (net != &init_net)
return 0;
if (nlmsg_len(cb->nlh) >= sizeof(struct rtmsg) && if (nlmsg_len(cb->nlh) >= sizeof(struct rtmsg) &&
((struct rtmsg *) nlmsg_data(cb->nlh))->rtm_flags & RTM_F_CLONED) ((struct rtmsg *) nlmsg_data(cb->nlh))->rtm_flags & RTM_F_CLONED)
return ip_rt_dump(skb, cb); return ip_rt_dump(skb, cb);
@ -934,9 +925,6 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
struct net_device *dev = ptr; struct net_device *dev = ptr;
struct in_device *in_dev = __in_dev_get_rtnl(dev); struct in_device *in_dev = __in_dev_get_rtnl(dev);
if (dev->nd_net != &init_net)
return NOTIFY_DONE;
if (event == NETDEV_UNREGISTER) { if (event == NETDEV_UNREGISTER) {
fib_disable_ip(dev, 2); fib_disable_ip(dev, 2);
return NOTIFY_DONE; return NOTIFY_DONE;
@ -1016,10 +1004,6 @@ static int __net_init fib_net_init(struct net *net)
{ {
int error; int error;
error = 0;
if (net != &init_net)
goto out;
error = ip_fib_net_init(net); error = ip_fib_net_init(net);
if (error < 0) if (error < 0)
goto out; goto out;