summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-10-06 13:57:51 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-12-27 11:13:05 -0500
commit2060a5774452e35b4a1dc4371abbb5ffd691355f (patch)
tree0389286aed5bec256476585b0e793216c95a2412
parent1ba9ac7c35b30d6b958a30240e21ddaea8d21b35 (diff)
downloadlinux-3.10-2060a5774452e35b4a1dc4371abbb5ffd691355f.tar.gz
linux-3.10-2060a5774452e35b4a1dc4371abbb5ffd691355f.tar.bz2
linux-3.10-2060a5774452e35b4a1dc4371abbb5ffd691355f.zip
tipc: Enable use by containers having their own network namespace
Permits a Linux container to use TIPC sockets even when it has its own network namespace defined by removing the check that prohibits such use. This makes it possible for users who wish to isolate their container network traffic from normal network traffic to utilize TIPC. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--net/tipc/socket.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 42b8324ff2e..e2f7c5d370b 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -185,9 +185,6 @@ static int tipc_create(struct net *net, struct socket *sock, int protocol,
/* Validate arguments */
- if (!net_eq(net, &init_net))
- return -EAFNOSUPPORT;
-
if (unlikely(protocol != 0))
return -EPROTONOSUPPORT;