summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2013-07-29 11:07:36 -0700
committerDavid S. Miller <davem@davemloft.net>2013-07-30 19:16:51 -0700
commitfca418955148e4f4555d7ce911e9eee3e7970a7f (patch)
treed4403a0fa1f31c96ca5880f2c062018d78b1bf13 /net/core
parent69e12d887cf4a22de736209df27604e3d2ff9845 (diff)
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>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/flow_dissector.c3
1 files changed, 2 insertions, 1 deletions
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;
}