diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-18 09:36:55 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-18 09:36:55 +0400 |
| commit | d19d56ddc88e7895429ef118db9c83c7bbe3ce6a (patch) | |
| tree | c0db76f3527c88c95a8793c871f62d628fb3fd1d /net/ipv6/sit.c | |
| parent | de213e5eedecdfb1b1eea7e6be28bc64cac5c078 (diff) | |
| download | linux-d19d56ddc88e7895429ef118db9c83c7bbe3ce6a.tar.xz | |
net: Introduce skb_tunnel_rx() helper
skb rxhash should be cleared when a skb is handled by a tunnel before
being delivered again, so that correct packet steering can take place.
There are other cleanups and accounting that we can factorize in a new
helper, skb_tunnel_rx()
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/sit.c')
| -rw-r--r-- | net/ipv6/sit.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 5abae10cd884..e51e650ea80b 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -566,11 +566,9 @@ static int ipip6_rcv(struct sk_buff *skb) kfree_skb(skb); return 0; } - tunnel->dev->stats.rx_packets++; - tunnel->dev->stats.rx_bytes += skb->len; - skb->dev = tunnel->dev; - skb_dst_drop(skb); - nf_reset(skb); + + skb_tunnel_rx(skb, tunnel->dev); + ipip6_ecn_decapsulate(iph, skb); netif_rx(skb); rcu_read_unlock(); |