--- net/core/dev.c

+++ net/core/dev.c

@@ -1484,10 +1484,10 @@ EXPORT_SYMBOL(netif_device_attach);

static bool can_checksum_protocol(unsigned long features, __be16 protocol)

{

- return ((features & NETIF_F_GEN_CSUM) ||

- ((features & NETIF_F_IP_CSUM) &&

+ return ((features & NETIF_F_NO_CSUM) ||

+ ((features & NETIF_F_V4_CSUM) &&

protocol == htons(ETH_P_IP)) ||

- ((features & NETIF_F_IPV6_CSUM) &&

+ ((features & NETIF_F_V6_CSUM) &&

protocol == htons(ETH_P_IPV6)) ||

((features & NETIF_F_FCOE_CRC) &&

protocol == htons(ETH_P_FCOE)));

@@ -1747,6 +1747,14 @@ gso:

skb->next = nskb->next;

nskb->next = NULL;

+

+ /*

+ * If device doesnt need nskb->dst, release it right now while

+ * its hot in this cpu cache

+ */

+ if (dev->priv_flags & IFF_XMIT_DST_RELEASE)

+ skb_dst_drop(nskb);

+

rc = ops->ndo_start_xmit(nskb, dev);

if (unlikely(rc != NETDEV_TX_OK)) {

nskb->next = skb->next;

@@ -2519,7 +2527,7 @@ pull:

put_page(skb_shinfo(skb)->frags[0].page);

memmove(skb_shinfo(skb)->frags,

skb_shinfo(skb)->frags + 1,

- --skb_shinfo(skb)->nr_frags);

+ --skb_shinfo(skb)->nr_frags * sizeof(skb_frag_t));

}

}