diff options
| author |   William Tu <u9012063@gmail.com> | 2018-03-09 07:34:40 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-03-09 13:03:56 -0500 |
| commit | 3b04caab81649a9e8d5375b919b6653d791951df (patch) | |
| tree | 1bc4cf53cb82631048faa52eed19754cc731765e /net/ipv6/ip6_gre.c | |
| parent | Merge branch 'mlxsw-ACL-and-mirroring-fixes' (diff) | |
| download | linux-dev-3b04caab81649a9e8d5375b919b6653d791951df.tar.xz linux-dev-3b04caab81649a9e8d5375b919b6653d791951df.zip | |
ip6gre: add erspan v2 to tunnel lookup
The patch adds the erspan v2 proto in ip6gre_tunnel_lookup
so the erspan v2 tunnel can be found correctly.
Signed-off-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 3c353125546d..83c2fffd40be 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -126,7 +126,8 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev, struct ip6_tnl *t, *cand = NULL; struct ip6gre_net *ign = net_generic(net, ip6gre_net_id); int dev_type = (gre_proto == htons(ETH_P_TEB) || - gre_proto == htons(ETH_P_ERSPAN)) ? + gre_proto == htons(ETH_P_ERSPAN) || + gre_proto == htons(ETH_P_ERSPAN2)) ? ARPHRD_ETHER : ARPHRD_IP6GRE; int score, cand_score = 4; |