--- net/core/dev.c

+++ net/core/dev.c

@@ -1037,13 +1037,21 @@ EXPORT_SYMBOL(netdev_bonding_change);

void dev_load(struct net *net, const char *name)

{

struct net_device *dev;

+ int no_module;

read_lock(&dev_base_lock);

dev = __dev_get_by_name(net, name);

read_unlock(&dev_base_lock);

- if (!dev && capable(CAP_NET_ADMIN))

- request_module("%s", name);

+ no_module = !dev;

+ if (no_module && capable(CAP_NET_ADMIN))

+ no_module = request_module("netdev-%s", name);

+ if (no_module && capable(CAP_SYS_MODULE)) {

+ if (!request_module("%s", name))

+ pr_err("Loading kernel module for a network device "

+"with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "

+"instead\n", name);

+ }

}

EXPORT_SYMBOL(dev_load);

@@ -1484,10 +1492,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 +1755,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 +2535,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));

}

}

@@ -2598,6 +2614,8 @@ void napi_reuse_skb(struct napi_struct *

{

__skb_pull(skb, skb_headlen(skb));

skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));

+ skb->dev = napi->dev;

+ skb->iif = 0;

napi->skb = skb;

}