* [PATCH v2 net-next] net: tap: check vlan with eth_type_vlan() method
@ 2021-01-15 2:32 menglong8.dong
2021-01-16 4:20 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: menglong8.dong @ 2021-01-15 2:32 UTC (permalink / raw)
To: kuba
Cc: davem, ast, daniel, hawk, john.fastabend, netdev, linux-kernel,
bpf, Menglong Dong
From: Menglong Dong <dong.menglong@zte.com.cn>
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>
---
v2:
- use eth_type_vlan() in tap_get_user_xdp() too.
---
drivers/net/tap.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 3c652c8ac5ba..ff4aa35979a1 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -713,8 +713,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);
@@ -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 */
- 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);
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 net-next] net: tap: check vlan with eth_type_vlan() method
2021-01-15 2:32 [PATCH v2 net-next] net: tap: check vlan with eth_type_vlan() method menglong8.dong
@ 2021-01-16 4:20 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-01-16 4:20 UTC (permalink / raw)
To: Menglong Dong
Cc: kuba, davem, ast, daniel, hawk, john.fastabend, netdev,
linux-kernel, bpf, dong.menglong
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Thu, 14 Jan 2021 18:32:38 -0800 you wrote:
> From: Menglong Dong <dong.menglong@zte.com.cn>
>
> 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>
>
> [...]
Here is the summary with links:
- [v2,net-next] net: tap: check vlan with eth_type_vlan() method
https://git.kernel.org/netdev/net-next/c/b69df2608281
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-16 4:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-15 2:32 [PATCH v2 net-next] net: tap: check vlan with eth_type_vlan() method menglong8.dong
2021-01-16 4:20 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.