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

Commit 57a269d8 authored by Menglong Dong's avatar Menglong Dong Committed by Greg Kroah-Hartman
Browse files

net: tap: check vlan with eth_type_vlan() method 



[ Upstream commit b69df2608281b71575fbb3b9f426dbcc4be8a700 ]

Replace some checks for ETH_P_8021Q and ETH_P_8021AD in
drivers/net/tap.c with eth_type_vlan.

Signed-off-by: default avatarMenglong Dong <dong.menglong@zte.com.cn>
Link: https://lore.kernel.org/r/20210115023238.4681-1-dong.menglong@zte.com.cn


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Stable-dep-of: 4063384ef762 ("net: add vlan_get_protocol_and_depth() helper")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1747aa98

drivers/net/tap.c

+2 −4
Original line number Diff line number Diff line
@@ -715,8 +715,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control, 
	skb_probe_transport_header(skb);



	/* Move network header to the right position for VLAN tagged packets */

	if ((skb->protocol == htons(ETH_P_8021Q) ||

	     skb->protocol == htons(ETH_P_8021AD)) &&

	if (eth_type_vlan(skb->protocol) &&

	    __vlan_get_protocol(skb, skb->protocol, &depth) != 0)

		skb_set_network_header(skb, depth);
@@ -1177,8 +1176,7 @@ static int tap_get_user_xdp(struct tap_queue *q, struct xdp_buff *xdp) 
	}



	/* Move network header to the right position for VLAN tagged packets */

	if ((skb->protocol == htons(ETH_P_8021Q) ||

	     skb->protocol == htons(ETH_P_8021AD)) &&

	if (eth_type_vlan(skb->protocol) &&

	    __vlan_get_protocol(skb, skb->protocol, &depth) != 0)

		skb_set_network_header(skb, depth);