Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 2917a86f4c43ec44a3e18566acd7dd00d071660a..b6f45c5d84d52575e70679556b78b663534cfe08 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1200,6 +1200,7 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
        if (zerocopy) {
                skb_shinfo(skb)->destructor_arg = msg_control;
                skb_shinfo(skb)->tx_flags |= SKBTX_DEV_ZEROCOPY;
+               skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;
        }
 
        skb_reset_network_header(skb);