diff options
author | Vladislav Zolotarov <vladz@broadcom.com> | 2011-05-22 06:06:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-22 21:01:22 -0400 |
commit | 40955532bc9d865999dfc58b7896605d58650655 (patch) | |
tree | fad93cc9a965328419afa9e3e511864893b8f289 /drivers/net/bnx2x/bnx2x_cmn.c | |
parent | 792d4b5cb16b684958c2590f77688667ddec1f61 (diff) |
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: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2x/bnx2x_cmn.c')
-rw-r--r-- | drivers/net/bnx2x/bnx2x_cmn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2x/bnx2x_cmn.c b/drivers/net/bnx2x/bnx2x_cmn.c index 64d01e728a9d..d5bd35b7f2e1 100644 --- a/drivers/net/bnx2x/bnx2x_cmn.c +++ b/drivers/net/bnx2x/bnx2x_cmn.c | |||
@@ -131,7 +131,7 @@ static u16 bnx2x_free_tx_pkt(struct bnx2x *bp, struct bnx2x_fastpath *fp, | |||
131 | 131 | ||
132 | /* release skb */ | 132 | /* release skb */ |
133 | WARN_ON(!skb); | 133 | WARN_ON(!skb); |
134 | dev_kfree_skb(skb); | 134 | dev_kfree_skb_any(skb); |
135 | tx_buf->first_bd = 0; | 135 | tx_buf->first_bd = 0; |
136 | tx_buf->skb = NULL; | 136 | tx_buf->skb = NULL; |
137 | 137 | ||
@@ -465,7 +465,7 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp, | |||
465 | } else { | 465 | } else { |
466 | DP(NETIF_MSG_RX_STATUS, "Failed to allocate new pages" | 466 | DP(NETIF_MSG_RX_STATUS, "Failed to allocate new pages" |
467 | " - dropping packet!\n"); | 467 | " - dropping packet!\n"); |
468 | dev_kfree_skb(skb); | 468 | dev_kfree_skb_any(skb); |
469 | } | 469 | } |
470 | 470 | ||
471 | 471 | ||