3 files changed, 18 insertions, 9 deletions

diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 0f0f9ce3a776..b181dfb3d6d6 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -543,6 +543,7 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
                 skb->data_len += len;
                 skb->len += len;
                 skb->truesize += truesize;
+                skb_shinfo(skb)->gso_type |= SKB_GSO_SHARED_FRAG;
                 atomic_add(truesize, &skb->sk->sk_wmem_alloc);
                 while (len) {
                         int off = base & ~PAGE_MASK;
@@ -598,7 +599,7 @@ static int macvtap_skb_from_vnet_hdr(struct sk_buff *skb,
 
         if (vnet_hdr->gso_type != VIRTIO_NET_HDR_GSO_NONE) {
                 skb_shinfo(skb)->gso_size = vnet_hdr->gso_size;
-                skb_shinfo(skb)->gso_type = gso_type;
+                skb_shinfo(skb)->gso_type |= gso_type;
 
                 /* Header must be checked, and gso_segs computed. */
                 skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY;
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index c81680dc10eb..293ce8dfc9e6 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1005,6 +1005,7 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from,
                 skb->data_len += len;
                 skb->len += len;
                 skb->truesize += truesize;
+                skb_shinfo(skb)->gso_type |= SKB_GSO_SHARED_FRAG;
                 atomic_add(truesize, &skb->sk->sk_wmem_alloc);
                 while (len) {
                         int off = base & ~PAGE_MASK;
@@ -1150,16 +1151,18 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
         }
 
         if (gso.gso_type != VIRTIO_NET_HDR_GSO_NONE) {
+                unsigned short gso_type = 0;
+
                 pr_debug("GSO!\n");
                 switch (gso.gso_type & ~VIRTIO_NET_HDR_GSO_ECN) {
                 case VIRTIO_NET_HDR_GSO_TCPV4:
-                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+                        gso_type = SKB_GSO_TCPV4;
                         break;
                 case VIRTIO_NET_HDR_GSO_TCPV6:
-                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
+                        gso_type = SKB_GSO_TCPV6;
                         break;
                 case VIRTIO_NET_HDR_GSO_UDP:
-                        skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+                        gso_type = SKB_GSO_UDP;
                         break;
                 default:
                         tun->dev->stats.rx_frame_errors++;
@@ -1168,9 +1171,10 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile,
                 }
 
                 if (gso.gso_type & VIRTIO_NET_HDR_GSO_ECN)
-                        skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
+                        gso_type |= SKB_GSO_TCP_ECN;
 
                 skb_shinfo(skb)->gso_size = gso.gso_size;
+                skb_shinfo(skb)->gso_type |= gso_type;
                 if (skb_shinfo(skb)->gso_size == 0) {
                         tun->dev->stats.rx_frame_errors++;
                         kfree_skb(skb);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 701408a1ded6..58914c8ea68f 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -220,6 +220,7 @@ static void set_skb_frag(struct sk_buff *skb, struct page *page,
         skb->len += size;
         skb->truesize += PAGE_SIZE;
         skb_shinfo(skb)->nr_frags++;
+        skb_shinfo(skb)->gso_type |= SKB_GSO_SHARED_FRAG;
         *len -= size;
 }
 
@@ -379,16 +380,18 @@ static void receive_buf(struct receive_queue *rq, void *buf, unsigned int len)
                  ntohs(skb->protocol), skb->len, skb->pkt_type);
 
         if (hdr->hdr.gso_type != VIRTIO_NET_HDR_GSO_NONE) {
+                unsigned short gso_type = 0;
+
                 pr_debug("GSO!\n");
                 switch (hdr->hdr.gso_type & ~VIRTIO_NET_HDR_GSO_ECN) {
                 case VIRTIO_NET_HDR_GSO_TCPV4:
-                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
+                        gso_type = SKB_GSO_TCPV4;
                         break;
                 case VIRTIO_NET_HDR_GSO_UDP:
-                        skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+                        gso_type = SKB_GSO_UDP;
                         break;
                 case VIRTIO_NET_HDR_GSO_TCPV6:
-                        skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
+                        gso_type = SKB_GSO_TCPV6;
                         break;
                 default:
                         net_warn_ratelimited("%s: bad gso type %u.\n",
@@ -397,7 +400,7 @@ static void receive_buf(struct receive_queue *rq, void *buf, unsigned int len)
                 }
 
                 if (hdr->hdr.gso_type & VIRTIO_NET_HDR_GSO_ECN)
-                        skb_shinfo(skb)->gso_type |= SKB_GSO_TCP_ECN;
+                        gso_type |= SKB_GSO_TCP_ECN;
 
                 skb_shinfo(skb)->gso_size = hdr->hdr.gso_size;
                 if (skb_shinfo(skb)->gso_size == 0) {
@@ -405,6 +408,7 @@ static void receive_buf(struct receive_queue *rq, void *buf, unsigned int len)
                         goto frame_err;
                 }
 
+                skb_shinfo(skb)->gso_type |= gso_type;
                 /* Header must be checked, and gso_segs computed. */
                 skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY;
                 skb_shinfo(skb)->gso_segs = 0;