f5f173e2b7
* fixes NAND * adds latest ethernet patches Signed-off-by: John Crispin <john@phrozen.org>
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 1eea1536dbbbfda418751ec6f5387acb521ddb97 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Sat, 23 Apr 2016 09:25:00 +0200
|
|
Subject: [PATCH 084/102] net-next: mediatek: invalid buffer lookup in
|
|
mtk_tx_map()
|
|
|
|
The lookup of the tx_buffer in the error path inside mtk_tx_map() uses the
|
|
wrong descriptor pointer. This looks like a copy & paste error. Change the
|
|
code to use the correct pointer.
|
|
|
|
Signed-off-by: Sean Wang <keyhaede@gmail.com>
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
index d9664e5..17ca1c1 100644
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -686,7 +686,7 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
err_dma:
|
|
do {
|
|
- tx_buf = mtk_desc_to_tx_buf(ring, txd);
|
|
+ tx_buf = mtk_desc_to_tx_buf(ring, itxd);
|
|
|
|
/* unmap dma */
|
|
mtk_tx_unmap(&dev->dev, tx_buf);
|
|
--
|
|
1.7.10.4
|
|
|