projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7cdbac7
)
tuntap: set SOCK_ZEROCOPY flag during open
author
Jason Wang
<
[email protected]
>
Sat, 8 Jun 2013 06:17:41 +0000
(14:17 +0800)
committer
David S. Miller
<
[email protected]
>
Wed, 12 Jun 2013 07:44:35 +0000
(
00:44
-0700)
Commit
54f968d6efdbf7dec36faa44fc11f01b0e4d1990
(tuntap: move socket to tun_file) forgets to set SOCK_ZEROCOPY flag, which will
prevent vhost_net from doing zercopy w/ tap. This patch fixes this by setting
it during file open.
Cc: Michael S. Tsirkin <
[email protected]
>
Signed-off-by: Jason Wang <
[email protected]
>
Acked-by: Michael S. Tsirkin <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/tun.c
patch
|
blob
|
history
diff --git
a/drivers/net/tun.c
b/drivers/net/tun.c
index b1cbfbcff789c67ce320a5ac5a9c2a3dec17f647..bfa9bb48e42d5cfc06e299e64809e29ea3097b5b 100644
(file)
--- a/
drivers/net/tun.c
+++ b/
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;
}