---

yaml --- r: 377017 b: refs/heads/master c: 19a6afb h: refs/heads/master i: 377015: d2255b5 v: v3
git-mirror · Jun 12, 2013 · 7f6b87b · 7f6b87b
1 parent c72e65f
commit 7f6b87b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cdbac71f911494aa7d0343be23c092ca84a5ed4
+refs/heads/master: 19a6afb23e5d323e1245baa4e62755492b2f1200
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
@@ -2159,6 +2159,8 @@ static int tun_chr_open(struct inode *inode, struct file * file)
 	set_bit(SOCK_EXTERNALLY_ALLOCATED, &tfile->socket.flags);
 	INIT_LIST_HEAD(&tfile->next);
 
+	sock_set_flag(&tfile->sk, SOCK_ZEROCOPY);
+
 	return 0;
 }