diff options
author | Tom Herbert <therbert@google.com> | 2014-06-14 23:24:28 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-06-15 01:00:50 -0700 |
commit | e5eb4e30a51236079fb22bb9f75fcd31915b03c6 (patch) | |
tree | 8ad2ebd487bfd56a49f680061c078dff2f196af2 /include | |
parent | bbdff225ede6527f91184b2a7903df8aad803ace (diff) | |
download | linux-stable-e5eb4e30a51236079fb22bb9f75fcd31915b03c6.tar.gz linux-stable-e5eb4e30a51236079fb22bb9f75fcd31915b03c6.tar.bz2 linux-stable-e5eb4e30a51236079fb22bb9f75fcd31915b03c6.zip |
net: add skb_pop_rcv_encapsulation
This function is used by UDP encapsulation protocols in RX when
crossing encapsulation boundary. If ip_summed is set to
CHECKSUM_UNNECESSARY and encapsulation is not set, change to
CHECKSUM_NONE since the checksum has not been validated within the
encapsulation. Clears csum_valid by the same rationale.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/skbuff.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index e13ed90be7c2..ec89301ada41 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1854,6 +1854,18 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len) return pskb_may_pull(skb, skb_network_offset(skb) + len); } +static inline void skb_pop_rcv_encapsulation(struct sk_buff *skb) +{ + /* Only continue with checksum unnecessary if device indicated + * it is valid across encapsulation (skb->encapsulation was set). + */ + if (skb->ip_summed == CHECKSUM_UNNECESSARY && !skb->encapsulation) + skb->ip_summed = CHECKSUM_NONE; + + skb->encapsulation = 0; + skb->csum_valid = 0; +} + /* * CPUs often take a performance hit when accessing unaligned memory * locations. The actual performance hit varies, it can be small if the |