diff options
author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-09-02 09:34:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-04 00:27:25 -0400 |
commit | 8b27f27797cac5ed9b2f3e63dac89a7ae70e70a7 (patch) | |
tree | c77b49fdf6883aab5bea6988d89f7e204f49329b /include | |
parent | 117961878cc1386923cfddcdd9016b777827c8dd (diff) |
skb: allow skb_scrub_packet() to be used by tunnels
This function was only used when a packet was sent to another netns. Now, it can
also be used after tunnel encapsulation or decapsulation.
Only skb_orphan() should not be done when a packet is not crossing netns.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 6f1330af1ebb..2ddb48d9312c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -2392,7 +2392,7 @@ extern void skb_split(struct sk_buff *skb, | |||
2392 | struct sk_buff *skb1, const u32 len); | 2392 | struct sk_buff *skb1, const u32 len); |
2393 | extern int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, | 2393 | extern int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, |
2394 | int shiftlen); | 2394 | int shiftlen); |
2395 | extern void skb_scrub_packet(struct sk_buff *skb); | 2395 | extern void skb_scrub_packet(struct sk_buff *skb, bool xnet); |
2396 | 2396 | ||
2397 | extern struct sk_buff *skb_segment(struct sk_buff *skb, | 2397 | extern struct sk_buff *skb_segment(struct sk_buff *skb, |
2398 | netdev_features_t features); | 2398 | netdev_features_t features); |