flow_dissector: clean up IPIP case

Explicitly set proto to ETH_P_IP and jump directly to ip processing.

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

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 00ee068efc1c2374bc0195d9458eca00392359c6..3259446f3026baee03e3859507f5e865698febb1 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -139,7 +139,8 @@ bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow)
                break;
        }
        case IPPROTO_IPIP:
-               goto again;
+               proto = htons(ETH_P_IP);
+               goto ip;
        default:
                break;
        }