Commit a7525198 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

cxgb4: Call dev_kfree/consume_skb_any instead of [dev_]kfree_skb. 



Replace kfree_skb with dev_consume_skb_any in free_tx_desc that can be
called in hard irq and other contexts. dev_consume_skb_any is used
as this function consumes successfully transmitted skbs.

Replace dev_kfree_skb with dev_kfree_skb_any in t4_eth_xmit that can
be called in hard irq and other contexts, on paths that drop the skb.

Replace dev_kfree_skb with dev_consume_skb_any in t4_eth_xmit that can
be called in hard irq and other contexts, on paths that successfully
transmit the skb.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent f9ec8131

drivers/net/ethernet/chelsio/cxgb4/sge.c

+3 −3
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static void free_tx_desc(struct adapter *adap, struct sge_txq *q, 
		if (d->skb) {                       /* an SGL is present */

			if (unmap)

				unmap_sgl(dev, d->skb, d->sgl, q);

			kfree_skb(d->skb);

			dev_consume_skb_any(d->skb);

			d->skb = NULL;

		}

		++d;
@@ -1009,7 +1009,7 @@ netdev_tx_t t4_eth_xmit(struct sk_buff *skb, struct net_device *dev) 
	 * anything shorter than an Ethernet header.

	 */

	if (unlikely(skb->len < ETH_HLEN)) {

out_free:	dev_kfree_skb(skb);

out_free:	dev_kfree_skb_any(skb);

		return NETDEV_TX_OK;

	}
@@ -1104,7 +1104,7 @@ out_free: dev_kfree_skb(skb); 


	if (immediate) {

		inline_tx_skb(skb, &q->q, cpl + 1);

		dev_kfree_skb(skb);

		dev_consume_skb_any(skb);

	} else {

		int last_desc;