| From 117b7f2710dac30b0c8f840bdfaa1ae5db2fd7ff Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 11 Sep 2019 09:36:23 +0800 |
| Subject: net: sonic: replace dev_kfree_skb in sonic_send_packet |
| |
| From: Mao Wenan <maowenan@huawei.com> |
| |
| [ Upstream commit 49f6c90bf6805948b597eabb499e500a47cf24be ] |
| |
| sonic_send_packet will be processed in irq or non-irq |
| context, so it would better use dev_kfree_skb_any |
| instead of dev_kfree_skb. |
| |
| Fixes: d9fb9f384292 ("*sonic/natsemi/ns83829: Move the National Semi-conductor drivers") |
| Signed-off-by: Mao Wenan <maowenan@huawei.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/natsemi/sonic.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c |
| index 11f472fd5d477..a051dddcbd768 100644 |
| --- a/drivers/net/ethernet/natsemi/sonic.c |
| +++ b/drivers/net/ethernet/natsemi/sonic.c |
| @@ -222,7 +222,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) |
| laddr = dma_map_single(lp->device, skb->data, length, DMA_TO_DEVICE); |
| if (!laddr) { |
| pr_err_ratelimited("%s: failed to map tx DMA buffer.\n", dev->name); |
| - dev_kfree_skb(skb); |
| + dev_kfree_skb_any(skb); |
| return NETDEV_TX_OK; |
| } |
| |
| -- |
| 2.20.1 |
| |
