Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b04caab authored by William Tu's avatar William Tu Committed by David S. Miller
Browse files

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: default avatarWilliam Tu <u9012063@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4eb57ecc

net/ipv6/ip6_gre.c

+2 −1
Original line number Diff line number Diff line
@@ -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;