Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / um / drivers / net_kern.c

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 39f186252e02521ccc33eb0fad6b450ccfb19d73..f70dd540655de57bdcddf8c0e2ab1fc6e0e611ba 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -240,7 +240,7 @@ static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
        spin_unlock_irqrestore(&lp->lock, flags);
 
-       dev_kfree_skb(skb);
+       dev_consume_skb_any(skb);
 
        return NETDEV_TX_OK;
 }
@@ -659,10 +659,6 @@ static int __init eth_setup(char *str)
        }
 
        new = alloc_bootmem(sizeof(*new));
-       if (new == NULL) {
-               printk(KERN_ERR "eth_init : alloc_bootmem failed\n");
-               return 1;
-       }
 
        INIT_LIST_HEAD(&new->list);
        new->index = n;