diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /net/tipc/socket.c | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 42b8324ff2ee..e2f7c5d370ba 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, | |||
| 185 | 185 | ||
| 186 | /* Validate arguments */ | 186 | /* Validate arguments */ |
| 187 | 187 | ||
| 188 | if (!net_eq(net, &init_net)) | ||
| 189 | return -EAFNOSUPPORT; | ||
| 190 | |||
| 191 | if (unlikely(protocol != 0)) | 188 | if (unlikely(protocol != 0)) |
| 192 | return -EPROTONOSUPPORT; | 189 | return -EPROTONOSUPPORT; |
| 193 | 190 | ||