/* Enable cloud filter if ADQ is supported */
        if (vfres->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADQ)
                hw_features |= NETIF_F_HW_TC;
+       if (vfres->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_USO)
+               hw_features |= NETIF_F_GSO_UDP_L4;
 
        netdev->hw_features |= hw_features;
 
 
 
        /* determine offset of inner transport header */
        l4_offset = l4.hdr - skb->data;
-
        /* remove payload length from inner checksum */
        paylen = skb->len - l4_offset;
-       csum_replace_by_diff(&l4.tcp->check, (__force __wsum)htonl(paylen));
 
-       /* compute length of segmentation header */
-       *hdr_len = (l4.tcp->doff * 4) + l4_offset;
+       if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP_L4) {
+               csum_replace_by_diff(&l4.udp->check,
+                                    (__force __wsum)htonl(paylen));
+               /* compute length of UDP segmentation header */
+               *hdr_len = (u8)sizeof(l4.udp) + l4_offset;
+       } else {
+               csum_replace_by_diff(&l4.tcp->check,
+                                    (__force __wsum)htonl(paylen));
+               /* compute length of TCP segmentation header */
+               *hdr_len = (u8)((l4.tcp->doff * 4) + l4_offset);
+       }
 
        /* pull values out of skb_shinfo */
        gso_size = skb_shinfo(skb)->gso_size;
 
               VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM |
               VIRTCHNL_VF_OFFLOAD_REQ_QUEUES |
               VIRTCHNL_VF_OFFLOAD_ADQ |
+              VIRTCHNL_VF_OFFLOAD_USO |
               VIRTCHNL_VF_OFFLOAD_FDIR_PF |
               VIRTCHNL_VF_CAP_ADV_LINK_SPEED;