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>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index d6e00a39274c..72372ac90159 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -830,7 +830,7 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
                 tstats->rx_bytes += skb->len;
 
                 if (!net_eq(t->net, dev_net(t->dev)))
-                        skb_scrub_packet(skb);
+                        skb_scrub_packet(skb, true);
 
                 netif_rx(skb);
 
@@ -1002,7 +1002,7 @@ static int ip6_tnl_xmit2(struct sk_buff *skb,
         }
 
         if (!net_eq(t->net, dev_net(dev)))
-                skb_scrub_packet(skb);
+                skb_scrub_packet(skb, true);
 
         /*
          * Okay, now see if we can stuff it in the buffer as-is.