commit 4c64242a90a4932260d9ad32b12c745c466e2987
author Tom Herbert <tom@herbertland.com> Wed May 18 09:06:11 2016 -0700
committer David S. Miller <davem@davemloft.net> Fri May 20 18:03:16 2016 -0400
tree f847f686cdcedbc86ce2e2e0ba469f17ca96e3d0
parent 7e13318daa4a67bff2f800923a993ef3818b3c53

ipv6: Fix nexthdr for reinjection

In ip6_input_finish the nexthdr protocol is retrieved from the
next header offset that is returned in the cb of the skb.
This method does not work for UDP encapsulation that may not
even have a concept of a nexthdr field (e.g. FOU).

This patch checks for a final protocol (INET6_PROTO_FINAL) when a
protocol handler returns > 0. If the protocol is not final then
resubmission is performed on nhoff value. If the protocol is final
then the nexthdr is taken to be the return value.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>