From: Menglong Dong Date: Fri, 15 Jan 2021 02:32:38 +0000 (-0800) Subject: net: tap: check vlan with eth_type_vlan() method X-Git-Tag: baikal/aarch64/sdk5.10~154 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=52312a401241900e40c44f40f50ed5ff2e37618e;p=kernel.git net: tap: check vlan with eth_type_vlan() method [ Upstream commit a37147438c6332156848733de140744061ffb510 ] Replace some checks for ETH_P_8021Q and ETH_P_8021AD in drivers/net/tap.c with eth_type_vlan. Signed-off-by: Menglong Dong Link: https://lore.kernel.org/r/20210115023238.4681-1-dong.menglong@zte.com.cn Signed-off-by: Jakub Kicinski Stable-dep-of: 4063384ef762 ("net: add vlan_get_protocol_and_depth() helper") Signed-off-by: Sasha Levin --- diff --git a/drivers/net/tap.c b/drivers/net/tap.c index a522d1673fa87..ffdf0e165930c 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -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);