summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2013-07-29 20:07:42 +0200
committerDavid S. Miller <davem@davemloft.net>2013-07-31 04:16:52 +0200
commitb438f940d3541f478c6b37106ed095f1be7959ef (patch)
treeee997b510b1cb91a3977945f1f119187f5c9ab89 /net
parentflow_dissector: clean up IPIP case (diff)
downloadlinux-b438f940d3541f478c6b37106ed095f1be7959ef.tar.xz
linux-b438f940d3541f478c6b37106ed095f1be7959ef.zip
flow_dissector: add support for IPPROTO_IPV6
Support IPPROTO_IPV6 similar to IPPROTO_IPIP Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/flow_dissector.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 3259446f3026..ade9ff1c1980 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -141,6 +141,9 @@ ipv6:
case IPPROTO_IPIP:
proto = htons(ETH_P_IP);
goto ip;
+ case IPPROTO_IPV6:
+ proto = htons(ETH_P_IPV6);
+ goto ipv6;
default:
break;
}