diff --git a/[refs] b/[refs]
index 9d4f7cdd64c0..6e60a16d4461 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd8d627a6b66d9755637b4dad2083864a9bfce9a
+refs/heads/master: a26af1e08a3a1e0f88e6f2685ac2313d713a59c9
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 46339f6bcd00..038c1ef94d2e 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -529,9 +529,13 @@ static int tun_set_iff(struct file *file, struct ifreq *ifr)
 
 	if (ifr->ifr_flags & IFF_NO_PI)
 		tun->flags |= TUN_NO_PI;
+	else
+		tun->flags &= ~TUN_NO_PI;
 
 	if (ifr->ifr_flags & IFF_ONE_QUEUE)
 		tun->flags |= TUN_ONE_QUEUE;
+	else
+		tun->flags &= ~TUN_ONE_QUEUE;
 
 	file->private_data = tun;
 	tun->attached = 1;