diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h
index 27cc1d4643219a44c01a2404124cd45ef46f7f3d..973de012e7ef2adbeab5928c0f989dfecd519a2d 100644
--- a/include/linux/virtio_net.h
+++ b/include/linux/virtio_net.h
@@ -3,6 +3,8 @@
 #define _LINUX_VIRTIO_NET_H
 
 #include <linux/if_vlan.h>
+#include <linux/ip.h>
+#include <linux/ipv6.h>
 #include <linux/udp.h>
 #include <uapi/linux/tcp.h>
 #include <uapi/linux/virtio_net.h>
@@ -49,6 +51,7 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
                                        const struct virtio_net_hdr *hdr,
                                        bool little_endian)
 {
+       unsigned int nhlen = sizeof(struct iphdr);
        unsigned int gso_type = 0;
        unsigned int thlen = 0;
        unsigned int p_off = 0;
@@ -65,6 +68,7 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
                        gso_type = SKB_GSO_TCPV6;
                        ip_proto = IPPROTO_TCP;
                        thlen = sizeof(struct tcphdr);
+                       nhlen = sizeof(struct ipv6hdr);
                        break;
                case VIRTIO_NET_HDR_GSO_UDP:
                        gso_type = SKB_GSO_UDP;
@@ -100,7 +104,7 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
                if (!skb_partial_csum_set(skb, start, off))
                        return -EINVAL;
 
-               p_off = skb_transport_offset(skb) + thlen;
+               p_off = max_t(u32, nhlen, skb_transport_offset(skb)) + thlen;
                if (!pskb_may_pull(skb, p_off))
                        return -EINVAL;
        } else {
@@ -140,7 +144,7 @@ static inline int virtio_net_hdr_to_skb(struct sk_buff *skb,
 
                        skb_set_transport_header(skb, keys.control.thoff);
                } else if (gso_type) {
-                       p_off = thlen;
+                       p_off = nhlen + thlen;
                        if (!pskb_may_pull(skb, p_off))
                                return -EINVAL;
                }