target/linux/generic/patches-3.10/686-flow_dissector-clean-up-IPIP-case.patch

   1 From de03a7f8eddba389668e3c35d4a31d985d29778f Mon Sep 17 00:00:00 2001
   2 From: Tom Herbert <therbert@google.com>
   3 Date: Mon, 29 Jul 2013 11:07:36 -0700
   4 Subject: [PATCH 3/5] flow_dissector: clean up IPIP case
   5
   6 Explicitly set proto to ETH_P_IP and jump directly to ip processing.
   7
   8 Signed-off-by: Tom Herbert <therbert@google.com>
   9 Signed-off-by: David S. Miller <davem@davemloft.net>
  10 ---
  11  net/core/flow_dissector.c |    3 ++-
  12  1 file changed, 2 insertions(+), 1 deletion(-)
  13
  14 --- a/net/core/flow_dissector.c
  15 +++ b/net/core/flow_dissector.c
  16 @@ -139,7 +139,8 @@ ipv6:
  17                 break;
  18         }
  19         case IPPROTO_IPIP:
  20 -               goto again;
  21 +               proto = htons(ETH_P_IP);
  22 +               goto ip;
  23         default:
  24                 break;
  25         }