From: gregory.clement@bootlin.com (Gregory CLEMENT)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH net-next v2 6/7] net: mvneta: Verify hardware checksum only when offload checksum feature is set
Date: Fri, 13 Jul 2018 18:18:40 +0200 [thread overview]
Message-ID: <20180713161841.11202-7-gregory.clement@bootlin.com> (raw)
In-Reply-To: <20180713161841.11202-1-gregory.clement@bootlin.com>
From: Yelena Krivosheev <yelena@marvell.com>
If the checksum offload feature is not set, then there is no point to
check the status of the hardware.
[gregory: extract from a larger patch]
Signed-off-by: Yelena Krivosheev <yelena@marvell.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
---
drivers/net/ethernet/marvell/mvneta.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index c203ea061ab9..fdd4c9ecea04 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -1720,7 +1720,8 @@ static void mvneta_rx_error(struct mvneta_port *pp,
static void mvneta_rx_csum(struct mvneta_port *pp, u32 status,
struct sk_buff *skb)
{
- if ((status & MVNETA_RXD_L3_IP4) &&
+ if ((pp->dev->features & NETIF_F_RXCSUM) &&
+ (status & MVNETA_RXD_L3_IP4) &&
(status & MVNETA_RXD_L4_CSUM_OK)) {
skb->csum = 0;
skb->ip_summed = CHECKSUM_UNNECESSARY;
--
2.18.0
WARNING: multiple messages have this Message-ID (diff)
From: Gregory CLEMENT <gregory.clement@bootlin.com>
To: "David S. Miller" <davem@davemloft.net>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc: "Thomas Petazzoni" <thomas.petazzoni@bootlin.com>,
linux-arm-kernel@lists.infradead.org,
"Jason Cooper" <jason@lakedaemon.net>,
"Andrew Lunn" <andrew@lunn.ch>,
"Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>,
"Gregory CLEMENT" <gregory.clement@bootlin.com>,
"Yelena Krivosheev" <yelena@marvell.com>,
"Nadav Haklai" <nadavh@marvell.com>,
"Marcin Wojtas" <mw@semihalf.com>,
"Dmitri Epshtein" <dima@marvell.com>,
"Antoine Tenart" <antoine.tenart@bootlin.com>,
"Miquèl Raynal" <miquel.raynal@bootlin.com>,
"Maxime Chevallier" <maxime.chevallier@bootlin.com>
Subject: [PATCH net-next v2 6/7] net: mvneta: Verify hardware checksum only when offload checksum feature is set
Date: Fri, 13 Jul 2018 18:18:40 +0200 [thread overview]
Message-ID: <20180713161841.11202-7-gregory.clement@bootlin.com> (raw)
In-Reply-To: <20180713161841.11202-1-gregory.clement@bootlin.com>
From: Yelena Krivosheev <yelena@marvell.com>
If the checksum offload feature is not set, then there is no point to
check the status of the hardware.
[gregory: extract from a larger patch]
Signed-off-by: Yelena Krivosheev <yelena@marvell.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
---
drivers/net/ethernet/marvell/mvneta.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index c203ea061ab9..fdd4c9ecea04 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -1720,7 +1720,8 @@ static void mvneta_rx_error(struct mvneta_port *pp,
static void mvneta_rx_csum(struct mvneta_port *pp, u32 status,
struct sk_buff *skb)
{
- if ((status & MVNETA_RXD_L3_IP4) &&
+ if ((pp->dev->features & NETIF_F_RXCSUM) &&
+ (status & MVNETA_RXD_L3_IP4) &&
(status & MVNETA_RXD_L4_CSUM_OK)) {
skb->csum = 0;
skb->ip_summed = CHECKSUM_UNNECESSARY;
--
2.18.0
next prev parent reply other threads:[~2018-07-13 16:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 16:18 [PATCH net-next v2 0/7] A fix and a few improvements on mvneta Gregory CLEMENT
2018-07-13 16:18 ` Gregory CLEMENT
2018-07-13 16:18 ` [PATCH net-next v2 1/7] net: ethernet: mvneta: Fix napi structure mixup on armada 3700 Gregory CLEMENT
2018-07-13 16:18 ` Gregory CLEMENT
2018-07-13 16:18 ` [PATCH net-next v2 2/7] net: mvneta: remove data pointer usage from device_node structure Gregory CLEMENT
2018-07-13 16:18 ` Gregory CLEMENT
2018-07-13 16:18 ` [PATCH net-next v2 3/7] net: mvneta: increase number of buffers in RX and TX queue Gregory CLEMENT
2018-07-13 16:18 ` Gregory CLEMENT
2018-07-13 19:17 ` Russell King - ARM Linux
2018-07-13 19:17 ` Russell King - ARM Linux
2018-07-18 15:37 ` Gregory CLEMENT
2018-07-18 15:37 ` Gregory CLEMENT
2018-07-18 20:55 ` Dave Taht
2018-07-18 20:55 ` Dave Taht
2018-07-13 16:18 ` [PATCH net-next v2 4/7] net: mvneta: discriminate error cause for missed packet Gregory CLEMENT
2018-07-13 16:18 ` Gregory CLEMENT
2018-07-13 16:18 ` [PATCH net-next v2 5/7] net: mvneta: Allocate page for the descriptor Gregory CLEMENT
2018-07-13 16:18 ` Gregory CLEMENT
2018-07-14 1:23 ` David Miller
2018-07-14 1:23 ` David Miller
2018-07-13 16:18 ` Gregory CLEMENT [this message]
2018-07-13 16:18 ` [PATCH net-next v2 6/7] net: mvneta: Verify hardware checksum only when offload checksum feature is set Gregory CLEMENT
2018-07-13 16:18 ` [PATCH net-next v2 7/7] net: mvneta: Improve the buffer allocation method for SWBM Gregory CLEMENT
2018-07-13 16:18 ` Gregory CLEMENT
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=20180713161841.11202-7-gregory.clement@bootlin.com \
--to=gregory.clement@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.