aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 36e9bf8ec4..6dce9d2d46 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1509,11 +1509,11 @@ int dev_queue_xmit(struct sk_buff *skb)
1509 skb_set_transport_header(skb, skb->csum_start - 1509 skb_set_transport_header(skb, skb->csum_start -
1510 skb_headroom(skb)); 1510 skb_headroom(skb));
1511 1511
1512 if (!(dev->features & NETIF_F_GEN_CSUM) 1512 if (!(dev->features & NETIF_F_GEN_CSUM) &&
1513 || ((dev->features & NETIF_F_IP_CSUM) 1513 !((dev->features & NETIF_F_IP_CSUM) &&
1514 && skb->protocol == htons(ETH_P_IP)) 1514 skb->protocol == htons(ETH_P_IP)) &&
1515 || ((dev->features & NETIF_F_IPV6_CSUM) 1515 !((dev->features & NETIF_F_IPV6_CSUM) &&
1516 && skb->protocol == htons(ETH_P_IPV6))) 1516 skb->protocol == htons(ETH_P_IPV6)))
1517 if (skb_checksum_help(skb)) 1517 if (skb_checksum_help(skb))
1518 goto out_kfree_skb; 1518 goto out_kfree_skb;
1519 } 1519 }