Commit cb704c66 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tcp_v6_gso_csum_prep' 



Heiner Kallweit says:

====================
net: core: add helper tcp_v6_gso_csum_prep

Several network drivers for chips that support TSO6 share the same code
for preparing the TCP header, so let's factor it out to a helper.
A difference is that some drivers reset the payload_len whilst others
don't do this. This value is overwritten by TSO anyway, therefore
the new helper resets it in general.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9cb8e048 091c9f82

drivers/net/ethernet/atheros/alx/main.c

+1 −4
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/brocade/bna/bnad.c

+1 −6
Original line number Diff line number Diff line
@@ -2504,12 +2504,7 @@ bnad_tso_prepare(struct bnad *bnad, struct sk_buff *skb) 
					   IPPROTO_TCP, 0);

		BNAD_UPDATE_CTR(bnad, tso4);

	} else {

		struct ipv6hdr *ipv6h = ipv6_hdr(skb);



		ipv6h->payload_len = 0;

		tcp_hdr(skb)->check =

			~csum_ipv6_magic(&ipv6h->saddr, &ipv6h->daddr, 0,

					 IPPROTO_TCP, 0);

		tcp_v6_gso_csum_prep(skb);

		BNAD_UPDATE_CTR(bnad, tso6);

	}

drivers/net/ethernet/cisco/enic/enic_main.c

+1 −2
Original line number Diff line number Diff line
@@ -696,8 +696,7 @@ static void enic_preload_tcp_csum(struct sk_buff *skb) 
		tcp_hdr(skb)->check = ~csum_tcpudp_magic(ip_hdr(skb)->saddr,

			ip_hdr(skb)->daddr, 0, IPPROTO_TCP, 0);

	} else if (skb->protocol == cpu_to_be16(ETH_P_IPV6)) {

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

	}

}

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE