diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-10 15:29:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-10 15:29:31 -0700 |
| commit | 1b0ccfe54a6abd1bc4d7bdd1c33e61e2c58f72c7 (patch) | |
| tree | a5f41e7d373edd7f117d9a8872ae5d831df31d70 /net | |
| parent | 9c5a18a31b321f120efda412281bb9f610f84aa0 (diff) | |
| download | blackbird-obmc-linux-1b0ccfe54a6abd1bc4d7bdd1c33e61e2c58f72c7.tar.gz blackbird-obmc-linux-1b0ccfe54a6abd1bc4d7bdd1c33e61e2c58f72c7.zip | |
Revert "ipv6: Fix protocol resubmission"
This reverts commit 0243508edd317ff1fa63b495643a7c192fbfcd92.
It introduces new regressions.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_input.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index 41a73da371a9..f2e464eba5ef 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -212,13 +212,13 @@ static int ip6_input_finish(struct sock *sk, struct sk_buff *skb) */ rcu_read_lock(); +resubmit: idev = ip6_dst_idev(skb_dst(skb)); if (!pskb_pull(skb, skb_transport_offset(skb))) goto discard; nhoff = IP6CB(skb)->nhoff; nexthdr = skb_network_header(skb)[nhoff]; -resubmit: raw = raw6_local_deliver(skb, nexthdr); ipprot = rcu_dereference(inet6_protos[nexthdr]); if (ipprot) { @@ -246,12 +246,10 @@ resubmit: goto discard; ret = ipprot->handler(skb); - if (ret < 0) { - nexthdr = -ret; + if (ret > 0) goto resubmit; - } else if (ret == 0) { + else if (ret == 0) IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDELIVERS); - } } else { if (!raw) { if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) { |
