diff options
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r-- | net/ipv4/ipmr.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 7a7ee1cc3b5a..217ebe035b34 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c | |||
@@ -1831,14 +1831,12 @@ static int __pim_rcv(struct mr_table *mrt, struct sk_buff *skb, | |||
1831 | skb->mac_header = skb->network_header; | 1831 | skb->mac_header = skb->network_header; |
1832 | skb_pull(skb, (u8*)encap - skb->data); | 1832 | skb_pull(skb, (u8*)encap - skb->data); |
1833 | skb_reset_network_header(skb); | 1833 | skb_reset_network_header(skb); |
1834 | skb->dev = reg_dev; | ||
1835 | skb->protocol = htons(ETH_P_IP); | 1834 | skb->protocol = htons(ETH_P_IP); |
1836 | skb->ip_summed = 0; | 1835 | skb->ip_summed = 0; |
1837 | skb->pkt_type = PACKET_HOST; | 1836 | skb->pkt_type = PACKET_HOST; |
1838 | skb_dst_drop(skb); | 1837 | |
1839 | reg_dev->stats.rx_bytes += skb->len; | 1838 | skb_tunnel_rx(skb, reg_dev); |
1840 | reg_dev->stats.rx_packets++; | 1839 | |
1841 | nf_reset(skb); | ||
1842 | netif_rx(skb); | 1840 | netif_rx(skb); |
1843 | dev_put(reg_dev); | 1841 | dev_put(reg_dev); |
1844 | 1842 | ||