forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

skb: allow skb_scrub_packet() to be used by tunnels

Browse source 
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>
This commit is contained in:
Nicolas Dichtel 2013-09-02 15:34:56 +02:00 • committed by David S. Miller
parent 117961878c
commit 8b27f27797
6 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/ipv6/sit.c
View file

@ -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.