diff options
| author | Steve French <sfrench@us.ibm.com> | 2012-01-14 00:59:13 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2012-01-14 00:59:13 -0500 |
| commit | dcd169b761d52e3f9122e30442b83863bdf1d9d9 (patch) | |
| tree | 5e79741f1865a3aef840e68d7db9e7ed4d685b5a /net/tipc/socket.c | |
| parent | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (diff) | |
| parent | 7250170c9ed00f3b74b11b98afefab45020672dd (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
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 | ||