Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-artful-kernel.git] / net / ipv4 / udp_offload.c

diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 5d396b96ae8bb9766543de8e5b756d8aa3e29bdf..4c519c1dc1612d07dc9467e1eaaf3924653f0769 100644 (file)
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -61,8 +61,9 @@ static struct sk_buff *__skb_udp_tunnel_segment(struct sk_buff *skb,
 
        /* Try to offload checksum if possible */
        offload_csum = !!(need_csum &&
-                         (skb->dev->features &
-                          (is_ipv6 ? NETIF_F_V6_CSUM : NETIF_F_V4_CSUM)));
+                         ((skb->dev->features & NETIF_F_HW_CSUM) ||
+                          (skb->dev->features & (is_ipv6 ?
+                           NETIF_F_IPV6_CSUM : NETIF_F_IP_CSUM))));
 
        /* segment inner packet. */
        enc_features = skb->dev->hw_enc_features & features;