From: William Tu <[email protected]>
Upstream commit:
commit 3b04caab81649a9e8d5375b919b6653d791951df
Author: William Tu <[email protected]>
Date: Fri Mar 9 07:34:40 2018 -0800
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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Cc: William Tu <[email protected]>
Signed-off-by: Greg Rose <[email protected]>
---
datapath/linux/compat/ip6_gre.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/datapath/linux/compat/ip6_gre.c b/datapath/linux/compat/ip6_gre.c
index e0246d1..2f5fe49 100644
--- a/datapath/linux/compat/ip6_gre.c
+++ b/datapath/linux/compat/ip6_gre.c
@@ -138,7 +138,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;
--
1.8.3.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
