From ae106f75082de41a6bff8c1637532643c5c1c97e Mon Sep 17 00:00:00 2001 From: Vladislav Zolotarov Date: Sun, 22 May 2011 10:06:58 +0000 Subject: [PATCH] --- yaml --- r: 247975 b: refs/heads/master c: 40955532bc9d865999dfc58b7896605d58650655 h: refs/heads/master i: 247973: ba5725c7c198f49edfea1559300f9f92dd89efd2 247971: 6b9db5f4096e8d3d6ca5203a5c23a556db41d30d 247967: 64d4f17cbf759fd66560f356ec306808fb084ccf v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x/bnx2x_cmn.c | 4 ++-- trunk/drivers/net/bnx2x/bnx2x_cmn.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 82c715ada0cd..107b6860f981 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 792d4b5cb16b684958c2590f77688667ddec1f61 +refs/heads/master: 40955532bc9d865999dfc58b7896605d58650655 diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/bnx2x/bnx2x_cmn.c index 64d01e728a9d..d5bd35b7f2e1 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_cmn.c +++ b/trunk/drivers/net/bnx2x/bnx2x_cmn.c @@ -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); } diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.h b/trunk/drivers/net/bnx2x/bnx2x_cmn.h index fab161e8030d..1a3545bd8a92 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_cmn.h +++ b/trunk/drivers/net/bnx2x/bnx2x_cmn.h @@ -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; }