From: Heiner Kallweit <hkallweit1@gmail.com>
To: David Miller <davem@davemloft.net>,
Realtek linux nic maintainers <nic_swsd@realtek.com>,
Jay Cliburn <jcliburn@gmail.com>,
Chris Snook <chris.snook@gmail.com>,
Rasesh Mody <rmody@marvell.com>,
Sudarsana Kalluru <skalluru@marvell.com>,
GR-Linux-NIC-Dev@marvell.com,
Christian Benvenuti <benve@cisco.com>,
Govindarajulu Varadarajan <_govind@gmx.com>,
Parvi Kaustubhi <pkaustub@cisco.com>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>,
Guo-Fu Tseng <cooldavid@cooldavid.org>,
Shannon Nelson <snelson@pensando.io>,
Pensando Drivers <drivers@pensando.io>,
Timur Tabi <timur@kernel.org>,
Jassi Brar <jaswinder.singh@linaro.org>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
"K. Y. Srinivasan" <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Sasha Levin <sashal@kernel.org>, Ronak Doshi <doshir@vmware.com>,
"VMware, Inc." <pv-drivers@vmware.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
intel-wired-lan@lists.osuosl.org, linux-hyperv@vger.kernel.org,
Linux USB Mailing List <linux-usb@vger.kernel.org>
Subject: [PATCH net-next 2/3] r8169: use new helper tcp_v6_gso_csum_prep
Date: Mon, 17 Feb 2020 22:40:59 +0100 [thread overview]
Message-ID: <02ea88e7-1a79-f779-d58c-bb1dced0b3b4@gmail.com> (raw)
In-Reply-To: <76cd6cfc-f4f3-ece7-203a-0266b7f02a12@gmail.com>
Simplify the code by using new helper tcp_v6_gso_csum_prep.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 26 ++---------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 5a9143b50..75ba10069 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4108,29 +4108,6 @@ static bool rtl_test_hw_pad_bug(struct rtl8169_private *tp, struct sk_buff *skb)
return skb->len < ETH_ZLEN && tp->mac_version == RTL_GIGA_MAC_VER_34;
}
-/* msdn_giant_send_check()
- * According to the document of microsoft, the TCP Pseudo Header excludes the
- * packet length for IPv6 TCP large packets.
- */
-static int msdn_giant_send_check(struct sk_buff *skb)
-{
- const struct ipv6hdr *ipv6h;
- struct tcphdr *th;
- int ret;
-
- ret = skb_cow_head(skb, 0);
- if (ret)
- return ret;
-
- ipv6h = ipv6_hdr(skb);
- th = tcp_hdr(skb);
-
- th->check = 0;
- th->check = ~tcp_v6_check(0, &ipv6h->saddr, &ipv6h->daddr, 0);
-
- return ret;
-}
-
static void rtl8169_tso_csum_v1(struct sk_buff *skb, u32 *opts)
{
u32 mss = skb_shinfo(skb)->gso_size;
@@ -4163,9 +4140,10 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,
break;
case htons(ETH_P_IPV6):
- if (msdn_giant_send_check(skb))
+ if (skb_cow_head(skb, 0))
return false;
+ tcp_v6_gso_csum_prep(skb, false);
opts[0] |= TD1_GTSENV6;
break;
--
2.25.0
next prev parent reply other threads:[~2020-02-17 21:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 21:39 [PATCH net-next 0/3] net: core: add helper tcp_v6_gso_csum_prep Heiner Kallweit
2020-02-17 21:40 ` [PATCH net-next 1/3] " Heiner Kallweit
2020-02-18 18:25 ` Alexander Duyck
2020-02-18 18:53 ` Heiner Kallweit
2020-02-17 21:40 ` Heiner Kallweit [this message]
2020-02-18 18:37 ` [PATCH net-next 2/3] r8169: use new " Alexander Duyck
2020-02-18 18:45 ` Heiner Kallweit
2020-02-17 21:42 ` [PATCH net-next 3/3] net: " Heiner Kallweit
2020-02-18 18:34 ` Alexander Duyck
2020-02-18 18:54 ` Heiner Kallweit
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=02ea88e7-1a79-f779-d58c-bb1dced0b3b4@gmail.com \
--to=hkallweit1@gmail.com \
--cc=GR-Linux-NIC-Dev@marvell.com \
--cc=_govind@gmx.com \
--cc=benve@cisco.com \
--cc=chris.snook@gmail.com \
--cc=cooldavid@cooldavid.org \
--cc=davem@davemloft.net \
--cc=doshir@vmware.com \
--cc=drivers@pensando.io \
--cc=haiyangz@microsoft.com \
--cc=ilias.apalodimas@linaro.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jaswinder.singh@linaro.org \
--cc=jcliburn@gmail.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
--cc=pkaustub@cisco.com \
--cc=pv-drivers@vmware.com \
--cc=rmody@marvell.com \
--cc=sashal@kernel.org \
--cc=skalluru@marvell.com \
--cc=snelson@pensando.io \
--cc=sthemmin@microsoft.com \
--cc=timur@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).