Commit 516165a1 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller

igb/igbvf: Don't use lco_csum to compute IPv4 checksum

In the case of IPIP and SIT tunnel frames the outer transport header
offset is actually set to the same offset as the inner transport header.
This results in the lco_csum call not doing any checksum computation over
the inner IPv4/v6 header data.

In order to account for that I am updating the code so that we determine
the location to start the checksum ourselves based on the location of the
IPv4 header and the length.

Fixes: e10715d3 ("igb/igbvf: Add support for GSO partial")
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fadf3a28
...@@ -4931,11 +4931,15 @@ static int igb_tso(struct igb_ring *tx_ring, ...@@ -4931,11 +4931,15 @@ static int igb_tso(struct igb_ring *tx_ring,
/* initialize outer IP header fields */ /* initialize outer IP header fields */
if (ip.v4->version == 4) { if (ip.v4->version == 4) {
unsigned char *csum_start = skb_checksum_start(skb);
unsigned char *trans_start = ip.hdr + (ip.v4->ihl * 4);
/* IP header will have to cancel out any data that /* IP header will have to cancel out any data that
* is not a part of the outer IP header * is not a part of the outer IP header
*/ */
ip.v4->check = csum_fold(csum_add(lco_csum(skb), ip.v4->check = csum_fold(csum_partial(trans_start,
csum_unfold(l4.tcp->check))); csum_start - trans_start,
0));
type_tucmd |= E1000_ADVTXD_TUCMD_IPV4; type_tucmd |= E1000_ADVTXD_TUCMD_IPV4;
ip.v4->tot_len = 0; ip.v4->tot_len = 0;
......
...@@ -1965,11 +1965,15 @@ static int igbvf_tso(struct igbvf_ring *tx_ring, ...@@ -1965,11 +1965,15 @@ static int igbvf_tso(struct igbvf_ring *tx_ring,
/* initialize outer IP header fields */ /* initialize outer IP header fields */
if (ip.v4->version == 4) { if (ip.v4->version == 4) {
unsigned char *csum_start = skb_checksum_start(skb);
unsigned char *trans_start = ip.hdr + (ip.v4->ihl * 4);
/* IP header will have to cancel out any data that /* IP header will have to cancel out any data that
* is not a part of the outer IP header * is not a part of the outer IP header
*/ */
ip.v4->check = csum_fold(csum_add(lco_csum(skb), ip.v4->check = csum_fold(csum_partial(trans_start,
csum_unfold(l4.tcp->check))); csum_start - trans_start,
0));
type_tucmd |= E1000_ADVTXD_TUCMD_IPV4; type_tucmd |= E1000_ADVTXD_TUCMD_IPV4;
ip.v4->tot_len = 0; ip.v4->tot_len = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment