From 7f6b87bf5cbdce5bfad7a07cf7633798c1cc4458 Mon Sep 17 00:00:00 2001
From: Jason Wang <jasowang@redhat.com>
Date: Sat, 8 Jun 2013 14:17:41 +0800
Subject: [PATCH] --- yaml --- r: 377017 b: refs/heads/master c:
 19a6afb23e5d323e1245baa4e62755492b2f1200 h: refs/heads/master i:   377015:
 d2255b5175a737b35c745fc0864e6cdc1c62d252 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tun.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d75ac953f324..64894f6190ec 100644
--- 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
index b1cbfbcff789..bfa9bb48e42d 100644
--- 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;
 }