diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2020-02-18 20:58:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-02-19 11:20:59 -0800 |
| commit | 8b19c68c4ffeebbb84cdb0afe4205500c25d3d88 (patch) | |
| tree | e34a4b918a5efca917788cf7a64dfe7c37d33b6c /drivers/net/ethernet/realtek | |
| parent | 76eeb12b71a4aa5654694765c8c1bde9a1ce8bd8 (diff) | |
| download | linux-8b19c68c4ffeebbb84cdb0afe4205500c25d3d88.tar.gz linux-8b19c68c4ffeebbb84cdb0afe4205500c25d3d88.tar.bz2 linux-8b19c68c4ffeebbb84cdb0afe4205500c25d3d88.zip | |
r8169: use new helper tcp_v6_gso_csum_prep
Simplify the code by using the new helper tcp_v6_gso_csum_prep.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index ad4bb5ac686e..267b7ae05e23 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); opts[0] |= TD1_GTSENV6; break; |