X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Ftun.c;h=3bb991fd2b512b9bd20bb22066982e03f3b3245a;hb=07240fd0902c872f044f523893364a1a24c9f278;hp=7ab94c825b577f13b606bc938b834db6003559ad;hpb=44d28ab19c64d095314ac66f765d0c747519f4ed;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 7ab94c825b5..3bb991fd2b5 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -640,6 +640,14 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
 		return 0;
 	}
 
+	if (cmd == TUNGETFEATURES) {
+		/* Currently this just means: "what IFF flags are valid?".
+		 * This is needed because we never checked for invalid flags on
+		 * TUNSETIFF. */
+		return put_user(IFF_TUN | IFF_TAP | IFF_NO_PI | IFF_ONE_QUEUE,
+				(unsigned int __user*)argp);
+	}
+
 	if (!tun)
 		return -EBADFD;