diff options
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index ba74474836c0..60729134d253 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -318,9 +318,11 @@ enum { | |||
318 | 318 | ||
319 | SKB_GSO_GRE = 1 << 6, | 319 | SKB_GSO_GRE = 1 << 6, |
320 | 320 | ||
321 | SKB_GSO_UDP_TUNNEL = 1 << 7, | 321 | SKB_GSO_IPIP = 1 << 7, |
322 | 322 | ||
323 | SKB_GSO_MPLS = 1 << 8, | 323 | SKB_GSO_UDP_TUNNEL = 1 << 8, |
324 | |||
325 | SKB_GSO_MPLS = 1 << 9, | ||
324 | }; | 326 | }; |
325 | 327 | ||
326 | #if BITS_PER_LONG > 32 | 328 | #if BITS_PER_LONG > 32 |
@@ -2722,9 +2724,12 @@ static inline struct sec_path *skb_sec_path(struct sk_buff *skb) | |||
2722 | /* Keeps track of mac header offset relative to skb->head. | 2724 | /* Keeps track of mac header offset relative to skb->head. |
2723 | * It is useful for TSO of Tunneling protocol. e.g. GRE. | 2725 | * It is useful for TSO of Tunneling protocol. e.g. GRE. |
2724 | * For non-tunnel skb it points to skb_mac_header() and for | 2726 | * For non-tunnel skb it points to skb_mac_header() and for |
2725 | * tunnel skb it points to outer mac header. */ | 2727 | * tunnel skb it points to outer mac header. |
2728 | * Keeps track of level of encapsulation of network headers. | ||
2729 | */ | ||
2726 | struct skb_gso_cb { | 2730 | struct skb_gso_cb { |
2727 | int mac_offset; | 2731 | int mac_offset; |
2732 | int encap_level; | ||
2728 | }; | 2733 | }; |
2729 | #define SKB_GSO_CB(skb) ((struct skb_gso_cb *)(skb)->cb) | 2734 | #define SKB_GSO_CB(skb) ((struct skb_gso_cb *)(skb)->cb) |
2730 | 2735 | ||