diff options
| author |   Tom Herbert <therbert@google.com> | 2015-02-10 16:30:28 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-02-11 15:12:10 -0800 |
| commit | 6edec0e61b1e52f9144935d28c9088f5b202e61c (patch) | |
| tree | 6c0be33e56894f48033f6fffbe253bea3852e91c /include/linux/netdevice.h | |
| parent | net: Fix remcsum in GRO path to not change packet (diff) | |
| download | linux-dev-6edec0e61b1e52f9144935d28c9088f5b202e61c.tar.xz linux-dev-6edec0e61b1e52f9144935d28c9088f5b202e61c.zip | |
net: Clarify meaning of CHECKSUM_PARTIAL for receive path
The current meaning of CHECKSUM_PARTIAL for validating checksums
is that _all_ checksums in the packet are considered valid.
However, in the manner that CHECKSUM_PARTIAL is set only the checksum
at csum_start+csum_offset and any preceding checksums may
be considered valid. If there are checksums in the packet after
csum_offset it is possible they have not been verfied.
This patch changes CHECKSUM_PARTIAL logic in skb_csum_unnecessary and
__skb_gro_checksum_validate_needed to only considered checksums
referring to csum_start and any preceding checksums (with starting
offset before csum_start) to be verified.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 3aa02457fe4f..9e9be221e4bf 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2246,7 +2246,9 @@ static inline bool __skb_gro_checksum_validate_needed(struct sk_buff *skb, bool zero_okay, __sum16 check) { - return (skb->ip_summed != CHECKSUM_PARTIAL && + return ((skb->ip_summed != CHECKSUM_PARTIAL || + skb_checksum_start_offset(skb) < + skb_gro_offset(skb)) && NAPI_GRO_CB(skb)->csum_cnt == 0 && (!zero_okay || check)); } |