diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-09-02 15:34:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-09-04 00:27:25 -0400 |
| commit | 8b27f27797cac5ed9b2f3e63dac89a7ae70e70a7 (patch) | |
| tree | c77b49fdf6883aab5bea6988d89f7e204f49329b /net/core/dev.c | |
| parent | 117961878cc1386923cfddcdd9016b777827c8dd (diff) | |
| download | op-kernel-dev-8b27f27797cac5ed9b2f3e63dac89a7ae70e70a7.zip op-kernel-dev-8b27f27797cac5ed9b2f3e63dac89a7ae70e70a7.tar.gz | |
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 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 6fbb0c9..07684e8 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1697,7 +1697,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb) * call skb_scrub_packet() after it to clear pkt_type _after_ calling * eth_type_trans(). */ - skb_scrub_packet(skb); + skb_scrub_packet(skb, true); return netif_rx(skb); } |
