diff options
| author | Menglong Dong <dong.menglong@zte.com.cn> | 2021-01-14 18:32:38 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-05-30 12:44:01 +0100 |
| commit | 57a269d82f2ed41094c4bfb5b73210e48860ce43 (patch) | |
| tree | 392ac168095f2f3db6e504b092a35bcb854212dd | |
| parent | 1747aa98ab136b7a2aad2735270c93a94d2c9453 (diff) | |
| download | linux-stable-57a269d82f2ed41094c4bfb5b73210e48860ce43.tar.gz linux-stable-57a269d82f2ed41094c4bfb5b73210e48860ce43.tar.bz2 linux-stable-57a269d82f2ed41094c4bfb5b73210e48860ce43.zip | |
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: 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>
Stable-dep-of: 4063384ef762 ("net: add vlan_get_protocol_and_depth() helper")
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/net/tap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tap.c b/drivers/net/tap.c index a522d1673fa8..ffdf0e165930 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); |