From: Heiner Kallweit <hkallweit1@gmail.com>
To: David Miller <davem@davemloft.net>,
Jay Cliburn <jcliburn@gmail.com>,
Chris Snook <chris.snook@gmail.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH net-next v2 03/13] net: atheros: use new helper tcp_v6_gso_csum_prep
Date: Tue, 18 Feb 2020 20:59:55 +0100 [thread overview]
Message-ID: <45c910c2-36ed-2557-ac35-cb978e44cbf4@gmail.com> (raw)
In-Reply-To: <fffc8b6d-68ed-7501-18f1-94cf548821fb@gmail.com>
Use new helper tcp_v6_gso_csum_prep in additional network drivers.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/atheros/alx/main.c | 5 +----
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 6 ++----
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 1dcbc486e..b9b4edb91 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1416,10 +1416,7 @@ static int alx_tso(struct sk_buff *skb, struct alx_txd *first)
0, IPPROTO_TCP, 0);
first->word1 |= 1 << TPD_IPV4_SHIFT;
} else if (skb_is_gso_v6(skb)) {
- ipv6_hdr(skb)->payload_len = 0;
- tcp_hdr(skb)->check = ~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
- &ipv6_hdr(skb)->daddr,
- 0, IPPROTO_TCP, 0);
+ tcp_v6_gso_csum_prep(skb);
/* LSOv2: the first TPD only provides the packet length */
first->adrl.l.pkt_len = skb->len;
first->word1 |= 1 << TPD_LSO_V2_SHIFT;
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 4c0b1f855..0d67b951c 100644
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -2025,10 +2025,8 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,
"IPV6 tso with zero data??\n");
goto check_sum;
} else
- tcp_hdr(skb)->check = ~csum_ipv6_magic(
- &ipv6_hdr(skb)->saddr,
- &ipv6_hdr(skb)->daddr,
- 0, IPPROTO_TCP, 0);
+ tcp_v6_gso_csum_prep(skb);
+
etpd->word1 |= 1 << TPD_LSO_EN_SHIFT;
etpd->word1 |= 1 << TPD_LSO_VER_SHIFT;
etpd->pkt_len = cpu_to_le32(skb->len);
--
2.25.1
next prev parent reply other threads:[~2020-02-18 20:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-18 19:55 [PATCH net-next v2 0/13] net: core: add helper tcp_v6_gso_csum_prep Heiner Kallweit
2020-02-18 19:56 ` [PATCH net-next v2 01/13] " Heiner Kallweit
2020-02-18 19:58 ` [PATCH net-next v2 02/13] r8169: use new " Heiner Kallweit
2020-02-18 19:59 ` Heiner Kallweit [this message]
2020-02-18 20:01 ` [PATCH net-next v2 04/13] bna: " Heiner Kallweit
2020-02-18 20:02 ` [PATCH net-next v2 05/13] enic: " Heiner Kallweit
2020-02-18 20:05 ` [PATCH net-next v2 06/13] e1000(e): " Heiner Kallweit
2020-02-18 21:49 ` Jeff Kirsher
2020-02-18 20:06 ` [PATCH net-next v2 07/13] jme: " Heiner Kallweit
2020-02-19 3:53 ` Guo-Fu Tseng
2020-02-18 20:07 ` [PATCH net-next v2 08/13] ionic: " Heiner Kallweit
2020-02-18 22:56 ` Shannon Nelson
2020-02-18 20:08 ` [PATCH net-next v2 09/13] net: qcom/emac: " Heiner Kallweit
2020-02-18 20:09 ` [PATCH net-next v2 10/13] net: socionext: " Heiner Kallweit
2020-02-19 12:36 ` Ilias Apalodimas
2020-02-18 20:11 ` [PATCH net-next v2 11/13] hv_netvsc: " Heiner Kallweit
2020-02-18 20:12 ` [PATCH net-next v2 12/13] r8152: " Heiner Kallweit
2020-02-19 9:48 ` Hayes Wang
2020-02-18 20:13 ` [PATCH net-next v2 13/13] vmxnet3: " Heiner Kallweit
2020-02-19 19:22 ` [PATCH net-next v2 0/13] net: core: add " David Miller
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=45c910c2-36ed-2557-ac35-cb978e44cbf4@gmail.com \
--to=hkallweit1@gmail.com \
--cc=chris.snook@gmail.com \
--cc=davem@davemloft.net \
--cc=jcliburn@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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 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).