Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40955532 authored by Vladislav Zolotarov's avatar Vladislav Zolotarov Committed by David S. Miller
Browse files

bnx2x: call dev_kfree_skb_any instead of dev_kfree_skb 



replace function calls when possible call in both irq/non-irq contexts

Signed-off-by: default avatarDmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 792d4b5c

drivers/net/bnx2x/bnx2x_cmn.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp, 


	/* release skb */

	WARN_ON(!skb);

	dev_kfree_skb(skb);

	dev_kfree_skb_any(skb);

	tx_buf->first_bd = 0;

	tx_buf->skb = NULL;
@@ -465,7 +465,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp, 
		} else {

			DP(NETIF_MSG_RX_STATUS, "Failed to allocate new pages"

			   " - dropping packet!\n");

			dev_kfree_skb(skb);

			dev_kfree_skb_any(skb);

		}

drivers/net/bnx2x/bnx2x_cmn.h

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static inline int bnx2x_alloc_rx_skb(struct bnx2x *bp, 
	mapping = dma_map_single(&bp->pdev->dev, skb->data, fp->rx_buf_size,

				 DMA_FROM_DEVICE);

	if (unlikely(dma_mapping_error(&bp->pdev->dev, mapping))) {

		dev_kfree_skb(skb);

		dev_kfree_skb_any(skb);

		return -ENOMEM;

	}