From: Tom Herbert <therbert@google.com>
Date: Mon, 29 Jul 2013 18:07:36 +0000 (-0700)
Subject: flow_dissector: clean up IPIP case
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fca418955148e4f4555d7ce911e9eee3e7970a7f;p=openwrt%2Fstaging%2Fblogic.git

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 00ee068efc1c..3259446f3026 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -139,7 +139,8 @@ ipv6:
 		break;
 	}
 	case IPPROTO_IPIP:
-		goto again;
+		proto = htons(ETH_P_IP);
+		goto ip;
 	default:
 		break;
 	}