From 64342ee56ffd5669bf63c63ebe92881624bdeab4 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Fri, 27 Mar 2009 00:17:45 -0700 Subject: [PATCH] --- yaml --- r: 136059 b: refs/heads/master c: 71f6f6dfdf7c7a67462386d9ea05c1095a89c555 h: refs/heads/master i: 136057: 5bc61f4179eb0aea9293341d3f3f3e874789a755 136055: 4e0edc3490e91e16234e8575518ce74355ac26cb v: v3 --- [refs] | 2 +- trunk/net/ipv6/ip6_input.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 29e19f9ebf39..deba1ce0137f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1702857724fb39cb68ce581490010df99168fd0 +refs/heads/master: 71f6f6dfdf7c7a67462386d9ea05c1095a89c555 diff --git a/trunk/net/ipv6/ip6_input.c b/trunk/net/ipv6/ip6_input.c index f171e8dbac91..8f04bd9da274 100644 --- a/trunk/net/ipv6/ip6_input.c +++ b/trunk/net/ipv6/ip6_input.c @@ -75,8 +75,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL || !idev || unlikely(idev->cnf.disable_ipv6)) { IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDISCARDS); - rcu_read_unlock(); - goto out; + goto drop; } memset(IP6CB(skb), 0, sizeof(struct inet6_skb_parm)); @@ -147,7 +146,6 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt drop: rcu_read_unlock(); kfree_skb(skb); -out: return 0; }