OSDN Git Service

cs89x0: Call dev_consume_skb_any instead of dev_kfree_skb.
authorEric W. Biederman <ebiederm@xmission.com>
Sat, 15 Mar 2014 23:45:46 +0000 (16:45 -0700)
committerEric W. Biederman <ebiederm@xmission.com>
Tue, 25 Mar 2014 04:18:58 +0000 (21:18 -0700)
Replace dev_kfree_skb with dev_consume_skb_any in net_send_packet that
can be called in hard irq and other contexts.

net_send_packet consumes (not drops) the skb of interest.

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

index 19f642a..fe84fba 100644 (file)
@@ -1174,7 +1174,7 @@ static netdev_tx_t net_send_packet(struct sk_buff *skb, struct net_device *dev)
        writewords(lp, TX_FRAME_PORT, skb->data, (skb->len + 1) >> 1);
        spin_unlock_irqrestore(&lp->lock, flags);
        dev->stats.tx_bytes += skb->len;
-       dev_kfree_skb(skb);
+       dev_consume_skb_any(skb);
 
        /* We DO NOT call netif_wake_queue() here.
         * We also DO NOT call netif_start_queue().