netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Rob Herring <robherring2@gmail.com>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andreas Herrmann <andreas.herrmann@calxeda.com>,
	Lennert Buytenhek <buytenh@wantstofly.org>,
	Rob Herring <rob.herring@calxeda.com>
Subject: [PATCH 02/11] net: calxedaxgmac: read correct field in xgmac_desc_get_buf_len
Date: Mon, 26 Aug 2013 17:45:17 -0500	[thread overview]
Message-ID: <1377557126-10716-2-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1377557126-10716-1-git-send-email-robherring2@gmail.com>

From: Rob Herring <rob.herring@calxeda.com>

xgmac_desc_get_buf_len appears to have a copy/paste error. flags is the
wrong field to read. We should be reading buf_size field. cpu_to_le32
should also be le32_to_cpu. This never really mattered as this function
is only used for DMA mapping calls which happen to be nops with coherent
DMA.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
 drivers/net/ethernet/calxeda/xgmac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c
index 71f6720..d41af68 100644
--- a/drivers/net/ethernet/calxeda/xgmac.c
+++ b/drivers/net/ethernet/calxeda/xgmac.c
@@ -421,7 +421,7 @@ static inline void desc_set_buf_len(struct xgmac_dma_desc *p, u32 buf_sz)
 
 static inline int desc_get_buf_len(struct xgmac_dma_desc *p)
 {
-	u32 len = cpu_to_le32(p->flags);
+	u32 len = le32_to_cpu(p->buf_size);
 	return (len & DESC_BUFFER1_SZ_MASK) +
 		((len & DESC_BUFFER2_SZ_MASK) >> DESC_BUFFER2_SZ_OFFSET);
 }
-- 
1.8.1.2

  reply	other threads:[~2013-08-26 22:45 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-26 22:45 [PATCH 01/11] net: calxedaxgmac: remove NETIF_F_FRAGLIST setting Rob Herring
2013-08-26 22:45 ` Rob Herring [this message]
2013-08-26 22:45 ` [PATCH 03/11] net: calxedaxgmac: fix race between xgmac_tx_complete and xgmac_tx_err Rob Herring
2013-08-26 22:45 ` [PATCH 04/11] net: calxedaxgmac: fix possible skb free before tx complete Rob Herring
2013-08-26 22:45 ` [PATCH 05/11] net: calxedaxgmac: update ring buffer tx_head after barriers Rob Herring
2013-08-26 22:45 ` [PATCH 06/11] net: calxedaxgmac: fix race with tx queue stop/wake Rob Herring
2013-08-27 18:31   ` Ben Hutchings
2013-08-26 22:45 ` [PATCH 07/11] net: calxedaxgmac: enable interrupts after napi_enable Rob Herring
2013-08-26 22:45 ` [PATCH 08/11] net: calxedaxgmac: fix various errors in xgmac_set_rx_mode Rob Herring
2013-08-26 22:45 ` [PATCH 09/11] net: calxedaxgmac: remove some unused statistic counters Rob Herring
2013-08-26 22:45 ` [PATCH 10/11] net: calxedaxgmac: fix rx DMA mapping API size mismatches Rob Herring
2013-08-26 22:45 ` [PATCH 11/11] net: calxedaxgmac: fix xgmac_xmit DMA mapping error handling Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377557126-10716-2-git-send-email-robherring2@gmail.com \
    --to=robherring2@gmail.com \
    --cc=andreas.herrmann@calxeda.com \
    --cc=buytenh@wantstofly.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=rob.herring@calxeda.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).