openwrt/target/linux/generic/patches-3.10/686-flow_dissector-clean-up...

26 lines
674 B
Diff
Raw Normal View History

From de03a7f8eddba389668e3c35d4a31d985d29778f Mon Sep 17 00:00:00 2001
From: Tom Herbert <therbert@google.com>
Date: Mon, 29 Jul 2013 11:07:36 -0700
Subject: [PATCH 3/5] 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>
---
net/core/flow_dissector.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- 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;
}