diff options
| author | Tom Herbert <therbert@google.com> | 2014-08-28 06:26:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-30 05:41:11 +0200 |
| commit | 77cffe23c1f88835f6bd7b47bfa0c060c2969828 (patch) | |
| tree | 5ba7913e3c831eee16f1c115d83392102d024e67 /net/ipv4/gre_demux.c | |
| parent | net: Allocate a new 16 bits for flags in skbuff (diff) | |
| download | linux-77cffe23c1f88835f6bd7b47bfa0c060c2969828.tar.xz linux-77cffe23c1f88835f6bd7b47bfa0c060c2969828.zip | |
net: Clarification of CHECKSUM_UNNECESSARY
This patch:
- Clarifies the specific requirements of devices returning
CHECKSUM_UNNECESSARY (comments in skbuff.h).
- Adds csum_level field to skbuff. This is used to express how
many checksums are covered by CHECKSUM_UNNECESSARY (stores n - 1).
This replaces the overloading of skb->encapsulation, that field is
is now only used to indicate inner headers are valid.
- Change __skb_checksum_validate_needed to "consume" each checksum
as indicated by csum_level as layers of the the packet are parsed.
- Remove skb_pop_rcv_encapsulation, no longer needed in the new
csum_level model.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/gre_demux.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index 7c1a8ff974dd..0485bf7f8f03 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -125,7 +125,6 @@ static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, *csum_err = true; return -EINVAL; } - skb_pop_rcv_encapsulation(skb); options++; } |