From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: [PATCH v2 02/11] net: calxedaxgmac: read correct field in xgmac_desc_get_buf_len Date: Thu, 29 Aug 2013 22:13:39 -0500 Message-ID: <1377832428-18117-2-git-send-email-robherring2@gmail.com> References: <1377832428-18117-1-git-send-email-robherring2@gmail.com> Cc: Lennert Buytenhek , bhutchings@solarflare.com, Rob Herring To: netdev@vger.kernel.org Return-path: Received: from mail-ob0-f180.google.com ([209.85.214.180]:39277 "EHLO mail-ob0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753859Ab3H3DOC (ORCPT ); Thu, 29 Aug 2013 23:14:02 -0400 Received: by mail-ob0-f180.google.com with SMTP id v19so1371040obq.11 for ; Thu, 29 Aug 2013 20:14:00 -0700 (PDT) In-Reply-To: <1377832428-18117-1-git-send-email-robherring2@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Rob Herring 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 --- v2: No change 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