]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
sun4i-emac: Call dev_consume_skb_any instead of dev_kfree_skb.
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 25 Mar 2014 04:13:02 +0000 (21:13 -0700)
committerEric W. Biederman <ebiederm@xmission.com>
Tue, 25 Mar 2014 04:15:53 +0000 (21:15 -0700)
Replace dev_kfree_skb with dev_consume_skb_any in emacs_start_xmit
which can be called in hard irq and other contexts.

emac_start_xmit always transmits the packet making dev_consume_skb
the appropriate function to call.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
drivers/net/ethernet/allwinner/sun4i-emac.c

index 511f6eecd58bc8153ef9cbf6a0ae021e91d8d889..fcaeeb8a4929dbe2364752fe71f283dd46640ce3 100644 (file)
@@ -476,7 +476,7 @@ static int emac_start_xmit(struct sk_buff *skb, struct net_device *dev)
        spin_unlock_irqrestore(&db->lock, flags);
 
        /* free this SKB */
-       dev_kfree_skb(skb);
+       dev_consume_skb_any(skb);
 
        return NETDEV_TX_OK;
 }