From 68e979de5e2b1fab6003f21023b4f1fd2c28ee37 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 1 Oct 2010 16:14:55 +0000 Subject: [PATCH] --- yaml --- r: 214845 b: refs/heads/master c: 55747a0a73ea74a25fcebb0731e8d3f13fe8c09d h: refs/heads/master i: 214843: 079881261079efefd0efb037ec31741b552d23a8 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipmr.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4a0f1a242c71..24ffddf015e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddcb4541e917780ef7ccc68dd8df18ca0bc055d0 +refs/heads/master: 55747a0a73ea74a25fcebb0731e8d3f13fe8c09d diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c index 10b24c02deb0..1a92ebd85196 100644 --- a/trunk/net/ipv4/ipmr.c +++ b/trunk/net/ipv4/ipmr.c @@ -1805,6 +1805,7 @@ int ip_mr_input(struct sk_buff *skb) } #ifdef CONFIG_IP_PIMSM +/* called with rcu_read_lock() */ static int __pim_rcv(struct mr_table *mrt, struct sk_buff *skb, unsigned int pimlen) { @@ -1826,26 +1827,23 @@ static int __pim_rcv(struct mr_table *mrt, struct sk_buff *skb, read_lock(&mrt_lock); if (mrt->mroute_reg_vif_num >= 0) reg_dev = mrt->vif_table[mrt->mroute_reg_vif_num].dev; - if (reg_dev) - dev_hold(reg_dev); read_unlock(&mrt_lock); if (reg_dev == NULL) return 1; skb->mac_header = skb->network_header; - skb_pull(skb, (u8*)encap - skb->data); + skb_pull(skb, (u8 *)encap - skb->data); skb_reset_network_header(skb); skb->protocol = htons(ETH_P_IP); - skb->ip_summed = 0; + skb->ip_summed = CHECKSUM_NONE; skb->pkt_type = PACKET_HOST; skb_tunnel_rx(skb, reg_dev); netif_rx(skb); - dev_put(reg_dev); - return 0; + return NET_RX_SUCCESS; } #endif