diff options
author | 2012-01-31 15:13:14 +0100 | |
---|---|---|
committer | 2012-01-31 15:13:14 +0100 | |
commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /net/tipc/socket.c | |
parent | ALSA: HDA: Remove quirk for Toshiba Qosmio G50 (diff) | |
parent | Merge tag 'asoc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into fix/asoc (diff) | |
download | linux-dev-ea51e5040e24eefe44d70bc654a237ca1f0225b0.tar.xz linux-dev-ea51e5040e24eefe44d70bc654a237ca1f0225b0.zip |
Merge branch 'fix/asoc' 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, /* Validate arguments */ - if (!net_eq(net, &init_net)) - return -EAFNOSUPPORT; - if (unlikely(protocol != 0)) return -EPROTONOSUPPORT; |