From: Jose Abreu <Jose.Abreu@synopsys.com>
To: netdev@vger.kernel.org
Cc: Joao Pinto <Joao.Pinto@synopsys.com>,
Jose Abreu <Jose.Abreu@synopsys.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
"David S. Miller" <davem@davemloft.net>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH net-next v2 03/12] net: stmmac: xgmac: Correctly return that RX descriptor is not last one
Date: Mon, 12 Aug 2019 11:44:02 +0200 [thread overview]
Message-ID: <fb881abf7700041e4658fc999349b867e05b6856.1565602974.git.joabreu@synopsys.com> (raw)
In-Reply-To: <cover.1565602974.git.joabreu@synopsys.com>
In-Reply-To: <cover.1565602974.git.joabreu@synopsys.com>
Return the correct value when RX descriptor is not the last one.
Signed-off-by: Jose Abreu <joabreu@synopsys.com>
---
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Cc: Alexandre Torgue <alexandre.torgue@st.com>
Cc: Jose Abreu <joabreu@synopsys.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: netdev@vger.kernel.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
index 2391ede97597..717b50d4aa93 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_descs.c
@@ -26,16 +26,15 @@ static int dwxgmac2_get_rx_status(void *data, struct stmmac_extra_stats *x,
struct dma_desc *p)
{
unsigned int rdes3 = le32_to_cpu(p->des3);
- int ret = good_frame;
if (unlikely(rdes3 & XGMAC_RDES3_OWN))
return dma_own;
if (likely(!(rdes3 & XGMAC_RDES3_LD)))
+ return rx_not_ls;
+ if (unlikely((rdes3 & XGMAC_RDES3_ES) && (rdes3 & XGMAC_RDES3_LD)))
return discard_frame;
- if (unlikely(rdes3 & XGMAC_RDES3_ES))
- ret = discard_frame;
- return ret;
+ return good_frame;
}
static int dwxgmac2_get_tx_len(struct dma_desc *p)
--
2.7.4
next prev parent reply other threads:[~2019-08-12 9:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 9:43 [PATCH net-next v2 00/12] net: stmmac: Improvements for -next Jose Abreu
2019-08-12 9:44 ` [PATCH net-next v2 01/12] net: stmmac: Get correct timestamp values from XGMAC Jose Abreu
2019-08-13 20:57 ` Jakub Kicinski
2019-08-12 9:44 ` [PATCH net-next v2 02/12] net: stmmac: Prepare to add Split Header support Jose Abreu
2019-08-13 21:11 ` Jakub Kicinski
2019-08-12 9:44 ` Jose Abreu [this message]
2019-08-12 9:44 ` [PATCH net-next v2 04/12] net: stmmac: Add Split Header support and enable it in XGMAC cores Jose Abreu
2019-08-12 21:06 ` David Miller
2019-08-13 8:30 ` Jose Abreu
2019-08-12 9:44 ` [PATCH net-next v2 05/12] net: stmmac: Add a counter for Split Header packets Jose Abreu
2019-08-12 9:44 ` [PATCH net-next v2 06/12] net: stmmac: dwxgmac: Add Flexible PPS support Jose Abreu
2019-08-12 9:44 ` [PATCH net-next v2 07/12] net: stmmac: Add ethtool register dump for XGMAC cores Jose Abreu
2019-08-13 21:19 ` Jakub Kicinski
2019-08-12 9:44 ` [PATCH net-next v2 08/12] net: stmmac: Add support for SA Insertion/Replacement in " Jose Abreu
2019-08-12 9:44 ` [PATCH net-next v2 09/12] net: stmmac: selftests: Add tests for SA Insertion/Replacement Jose Abreu
2019-08-12 9:44 ` [PATCH net-next v2 10/12] net: stmmac: xgmac: Add EEE support Jose Abreu
2019-08-12 9:44 ` [PATCH net-next v2 11/12] net: stmmac: Add support for VLAN Insertion Offload Jose Abreu
2019-08-12 9:44 ` [PATCH net-next v2 12/12] net: stmmac: selftests: Add selftest for VLAN TX Offload Jose Abreu
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=fb881abf7700041e4658fc999349b867e05b6856.1565602974.git.joabreu@synopsys.com \
--to=jose.abreu@synopsys.com \
--cc=Joao.Pinto@synopsys.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.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).