mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-07 00:59:06 +00:00
net: tap: check vlan with eth_type_vlan() method
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 <dong.menglong@zte.com.cn> Link: https://lore.kernel.org/r/20210115023238.4681-1-dong.menglong@zte.com.cn Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
32d91b4af3
commit
b69df26082
1 changed files with 2 additions and 4 deletions
|
@ -713,8 +713,7 @@ static ssize_t tap_get_user(struct tap_queue *q, void *msg_control,
|
||||||
skb_probe_transport_header(skb);
|
skb_probe_transport_header(skb);
|
||||||
|
|
||||||
/* Move network header to the right position for VLAN tagged packets */
|
/* Move network header to the right position for VLAN tagged packets */
|
||||||
if ((skb->protocol == htons(ETH_P_8021Q) ||
|
if (eth_type_vlan(skb->protocol) &&
|
||||||
skb->protocol == htons(ETH_P_8021AD)) &&
|
|
||||||
__vlan_get_protocol(skb, skb->protocol, &depth) != 0)
|
__vlan_get_protocol(skb, skb->protocol, &depth) != 0)
|
||||||
skb_set_network_header(skb, depth);
|
skb_set_network_header(skb, depth);
|
||||||
|
|
||||||
|
@ -1164,8 +1163,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 */
|
/* Move network header to the right position for VLAN tagged packets */
|
||||||
if ((skb->protocol == htons(ETH_P_8021Q) ||
|
if (eth_type_vlan(skb->protocol) &&
|
||||||
skb->protocol == htons(ETH_P_8021AD)) &&
|
|
||||||
__vlan_get_protocol(skb, skb->protocol, &depth) != 0)
|
__vlan_get_protocol(skb, skb->protocol, &depth) != 0)
|
||||||
skb_set_network_header(skb, depth);
|
skb_set_network_header(skb, depth);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue