1 files changed, 18 insertions, 5 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 5b5cd3189c98..ec89301ada41 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -338,17 +338,18 @@ enum {
 
         SKB_GSO_GRE = 1 << 6,
 
-        SKB_GSO_IPIP = 1 << 7,
+        SKB_GSO_GRE_CSUM = 1 << 7,
 
-        SKB_GSO_SIT = 1 << 8,
+        SKB_GSO_IPIP = 1 << 8,
 
-        SKB_GSO_UDP_TUNNEL = 1 << 9,
+        SKB_GSO_SIT = 1 << 9,
 
-        SKB_GSO_MPLS = 1 << 10,
+        SKB_GSO_UDP_TUNNEL = 1 << 10,
 
         SKB_GSO_UDP_TUNNEL_CSUM = 1 << 11,
 
-        SKB_GSO_GRE_CSUM = 1 << 12,
+        SKB_GSO_MPLS = 1 << 12,
+
 };
 
 #if BITS_PER_LONG > 32
@@ -1853,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