diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
| commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
| tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /drivers/net/ethernet/cavium | |
| parent | 5e54b3c1202765ae62de24a160f1eaf6b0ebf9d4 (diff) | |
| parent | f335195adf043168ee69d78ea72ac3e30f0c57ce (diff) | |
| download | linux-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium')
| -rw-r--r-- | drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c index 095c18aeb8d5..f38ea349aa00 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c @@ -1356,6 +1356,8 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry, /* Offload checksum calculation to HW */ if (skb->ip_summed == CHECKSUM_PARTIAL) { + if (ip.v4->version == 4) + hdr->csum_l3 = 1; /* Enable IP csum calculation */ hdr->l3_offset = skb_network_offset(skb); hdr->l4_offset = skb_transport_offset(skb); |