diff options
Diffstat (limited to 'target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch b/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch new file mode 100644 index 0000000000..467ca00f23 --- /dev/null +++ b/target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch @@ -0,0 +1,25 @@ +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; + } |