[Devel] [PATCH 3/7] Revert "ve/rtnl: allow move network devices into network namespace in CT"

[Andrew Vagin]

This reverts commit b238eaaf8029c022899ee874132814bd1be5551f.

Signed-off-by: Andrew Vagin <avagin at openvz.org>
---
 net/core/rtnetlink.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 2e8b10f..0d2df96 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1403,8 +1403,7 @@ static int do_setlink(const struct sk_buff *skb,
 			err = PTR_ERR(net);
 			goto errout;
 		}
-		if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN) &&
-		    !netlink_ns_capable(skb, net->user_ns, CAP_VE_NET_ADMIN)) {
+		if (!netlink_ns_capable(skb, net->user_ns, CAP_NET_ADMIN)) {
 			err = -EPERM;
 			goto errout;
 		}
-- 
1.7.1