summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMichael Dalton <mwdalton@google.com>2013-03-11 06:52:28 +0000
committerDavid S. Miller <davem@davemloft.net>2013-03-12 05:14:06 -0400
commite1733de2243609073534cf56afb146a62af3c3d8 (patch)
treeed216256b1375155a153597d13364564a5ba6fb0 /net
parentf4f3efdaf9f0770b69fb2c86f1a67547ad756942 (diff)
flow_dissector: support L2 GRE
Add support for L2 GRE tunnels, so that RPS can be more effective. Signed-off-by: Michael Dalton <mwdalton@google.com> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/flow_dissector.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 9d4c7201400d..f8d9e03b7a7c 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -119,6 +119,17 @@ ipv6:
nhoff += 4;
if (hdr->flags & GRE_SEQ)
nhoff += 4;
+ if (proto == htons(ETH_P_TEB)) {
+ const struct ethhdr *eth;
+ struct ethhdr _eth;
+
+ eth = skb_header_pointer(skb, nhoff,
+ sizeof(_eth), &_eth);
+ if (!eth)
+ return false;
+ proto = eth->h_proto;
+ nhoff += sizeof(*eth);
+ }
goto again;
}
break;