tuntap: set SOCK_ZEROCOPY flag during open
authorJason Wang <jasowang@redhat.com>
Sat, 8 Jun 2013 06:17:41 +0000 (14:17 +0800)
committerDavid S. Miller <davem@davemloft.net>
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 <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tun.c

index b1cbfbcff789c67ce320a5ac5a9c2a3dec17f647..bfa9bb48e42d5cfc06e299e64809e29ea3097b5b 100644 (file)
@@ -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;
 }