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/sit.c b/net/ipv6/sit.c
index 1d1458a3b7c4..b2e44f478e14 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -622,7 +622,7 @@ static int ipip6_rcv(struct sk_buff *skb)
                 tstats->rx_bytes += skb->len;
 
                 if (!net_eq(tunnel->net, dev_net(tunnel->dev)))
-                        skb_scrub_packet(skb);
+                        skb_scrub_packet(skb, true);
                 netif_rx(skb);
 
                 return 0;
@@ -861,7 +861,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
         }
 
         if (!net_eq(tunnel->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.