aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/chelsio/cxgb4/sge.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/chelsio/cxgb4/sge.c')
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/sge.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
index d4db382ff8c7..ca95cf2954eb 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
@@ -383,7 +383,7 @@ static void free_tx_desc(struct adapter *adap, struct sge_txq *q,
383 if (d->skb) { /* an SGL is present */ 383 if (d->skb) { /* an SGL is present */
384 if (unmap) 384 if (unmap)
385 unmap_sgl(dev, d->skb, d->sgl, q); 385 unmap_sgl(dev, d->skb, d->sgl, q);
386 kfree_skb(d->skb); 386 dev_consume_skb_any(d->skb);
387 d->skb = NULL; 387 d->skb = NULL;
388 } 388 }
389 ++d; 389 ++d;
@@ -1009,7 +1009,7 @@ netdev_tx_t t4_eth_xmit(struct sk_buff *skb, struct net_device *dev)
1009 * anything shorter than an Ethernet header. 1009 * anything shorter than an Ethernet header.
1010 */ 1010 */
1011 if (unlikely(skb->len < ETH_HLEN)) { 1011 if (unlikely(skb->len < ETH_HLEN)) {
1012out_free: dev_kfree_skb(skb); 1012out_free: dev_kfree_skb_any(skb);
1013 return NETDEV_TX_OK; 1013 return NETDEV_TX_OK;
1014 } 1014 }
1015 1015
@@ -1104,7 +1104,7 @@ out_free: dev_kfree_skb(skb);
1104 1104
1105 if (immediate) { 1105 if (immediate) {
1106 inline_tx_skb(skb, &q->q, cpl + 1); 1106 inline_tx_skb(skb, &q->q, cpl + 1);
1107 dev_kfree_skb(skb); 1107 dev_consume_skb_any(skb);
1108 } else { 1108 } else {
1109 int last_desc; 1109 int last_desc;
1110 1110