Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1394964

[PATCH 04/12] net-next: mediatek: invalid buffer lookup in mtk_tx_map()

From John Crispin <john@phrozen.org>
Newsgroups linux.kernel
Subject [PATCH 04/12] net-next: mediatek: invalid buffer lookup in mtk_tx_map()
Date 2016-05-05 11:40 +0200
Message-ID <rvnVf-5Rb-3@gated-at.bofh.it> (permalink)
References <rvnLA-5Kz-9@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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: 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 e415986..7fdd1a3 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -671,7 +671,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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 00/12] net-next: mediatek: bug fixes and tx stall fixes John Crispin <john@phrozen.org> - 2016-05-05 11:30 +0200
  [PATCH 01/12] net-next: mediatek: fix DQL support John Crispin <john@phrozen.org> - 2016-05-05 11:30 +0200
  [PATCH 09/12] net-next: mediatek: increase watchdog_timeo John Crispin <john@phrozen.org> - 2016-05-05 11:30 +0200
  [PATCH 06/12] net-next: mediatek: add next data pointer coherency protection John Crispin <john@phrozen.org> - 2016-05-05 11:30 +0200
  [PATCH 04/12] net-next: mediatek: invalid buffer lookup in mtk_tx_map() John Crispin <john@phrozen.org> - 2016-05-05 11:40 +0200
  [PATCH 08/12] net-next: mediatek: fix threshold value John Crispin <john@phrozen.org> - 2016-05-05 11:40 +0200
  [PATCH 03/12] net-next: mediatek: fix missing free of scratch memory John Crispin <john@phrozen.org> - 2016-05-05 11:40 +0200
  [PATCH 02/12] net-next: mediatek: add missing return code check John Crispin <john@phrozen.org> - 2016-05-05 11:40 +0200
  [PATCH 12/12] net-next: mediatek: remove superfluous queue wake up call John Crispin <john@phrozen.org> - 2016-05-05 12:00 +0200
  [PATCH 10/12] net-next: mediatek: fix off by one in the TX ring allocation John Crispin <john@phrozen.org> - 2016-05-05 12:00 +0200
  [PATCH 11/12] net-next: mediatek: only wake the queue if it is stopped John Crispin <john@phrozen.org> - 2016-05-05 12:00 +0200
  Re: [PATCH 00/12] net-next: mediatek: bug fixes and tx stall fixes Andrew Lunn <andrew@lunn.ch> - 2016-05-05 14:30 +0200

csiph-web