Commit 2b316fbc authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

e1000(e): use new helper tcp_v6_gso_csum_prep 



Use new helper tcp_v6_gso_csum_prep in additional network drivers.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarAlexander Duyck <alexander.h.duyck@linux.intel.com>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c50efba

drivers/net/ethernet/intel/e1000/e1000_main.c

+1 −5
Original line number Diff line number Diff line
@@ -2715,11 +2715,7 @@ static int e1000_tso(struct e1000_adapter *adapter, 
			cmd_length = E1000_TXD_CMD_IP;

			ipcse = skb_transport_offset(skb) - 1;

		} 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);

			ipcse = 0;

		}

		ipcss = skb_network_offset(skb);

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −4
Original line number Diff line number Diff line
@@ -5462,10 +5462,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb, 
		cmd_length = E1000_TXD_CMD_IP;

		ipcse = skb_transport_offset(skb) - 1;

	} 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);

		ipcse = 0;

	}

	ipcss = skb_network_offset(skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE