--- net/core/dev.c

+++ net/core/dev.c

@@ -1037,21 +1037,13 @@ 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);

- 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);

- }

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

+ request_module("%s", name);

}

EXPORT_SYMBOL(dev_load);

@@ -1755,14 +1747,6 @@ 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;