Merge branch 'linus' into cpumask-for-linus

[sfrench/cifs-2.6.git] / drivers / net / pppox.c

diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index 03aecc97fb453d32eefb596dddba3f6286d909df..4f6d33fbc673ccb45a95cc56ebe915b712d3b07e 100644 (file)
--- a/drivers/net/pppox.c
+++ b/drivers/net/pppox.c
@@ -108,9 +108,6 @@ static int pppox_create(struct net *net, struct socket *sock, int protocol)
 {
        int rc = -EPROTOTYPE;
 
-       if (net != &init_net)
-               return -EAFNOSUPPORT;
-
        if (protocol < 0 || protocol > PX_MAX_PROTO)
                goto out;