diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-17 22:36:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-17 22:36:55 -0700 |
| commit | d19d56ddc88e7895429ef118db9c83c7bbe3ce6a (patch) | |
| tree | c0db76f3527c88c95a8793c871f62d628fb3fd1d /net/ipv6/ip6mr.c | |
| parent | de213e5eedecdfb1b1eea7e6be28bc64cac5c078 (diff) | |
| download | lwn-d19d56ddc88e7895429ef118db9c83c7bbe3ce6a.tar.gz lwn-d19d56ddc88e7895429ef118db9c83c7bbe3ce6a.zip | |
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/ip6mr.c')
| -rw-r--r-- | net/ipv6/ip6mr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 163850e22b11..bd9e7d3e9c8e 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -658,14 +658,12 @@ static int pim6_rcv(struct sk_buff *skb) skb->mac_header = skb->network_header; skb_pull(skb, (u8 *)encap - skb->data); skb_reset_network_header(skb); - skb->dev = reg_dev; skb->protocol = htons(ETH_P_IPV6); skb->ip_summed = 0; skb->pkt_type = PACKET_HOST; - skb_dst_drop(skb); - reg_dev->stats.rx_bytes += skb->len; - reg_dev->stats.rx_packets++; - nf_reset(skb); + + skb_tunnel_rx(skb, reg_dev); + netif_rx(skb); dev_put(reg_dev); return 0; |