* [PATCH net-next] net: core: use eth_type_vlan in __netif_receive_skb_core
@ 2021-01-11 10:42 menglong8.dong
2021-01-14 3:20 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: menglong8.dong @ 2021-01-11 10:42 UTC (permalink / raw)
To: kuba
Cc: davem, ast, andriin, daniel, edumazet, ap420073, xiyou.wangcong,
jiri, bjorn.topel, netdev, linux-kernel, Menglong Dong
From: Menglong Dong <dong.menglong@zte.com.cn>
Replace the check for ETH_P_8021Q and ETH_P_8021AD in
__netif_receive_skb_core with eth_type_vlan.
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
net/core/dev.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index e4d77c8abe76..267c4a8daa55 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5151,8 +5151,7 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc,
skb_reset_mac_len(skb);
}
- if (skb->protocol == cpu_to_be16(ETH_P_8021Q) ||
- skb->protocol == cpu_to_be16(ETH_P_8021AD)) {
+ if (eth_type_vlan(skb->protocol)) {
skb = skb_vlan_untag(skb);
if (unlikely(!skb))
goto out;
@@ -5236,8 +5235,7 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc,
* find vlan device.
*/
skb->pkt_type = PACKET_OTHERHOST;
- } else if (skb->protocol == cpu_to_be16(ETH_P_8021Q) ||
- skb->protocol == cpu_to_be16(ETH_P_8021AD)) {
+ } else if (eth_type_vlan(skb->protocol)) {
/* Outer header is 802.1P with vlan 0, inner header is
* 802.1Q or 802.1AD and vlan_do_receive() above could
* not find vlan dev for vlan id 0.
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: core: use eth_type_vlan in __netif_receive_skb_core
2021-01-11 10:42 [PATCH net-next] net: core: use eth_type_vlan in __netif_receive_skb_core menglong8.dong
@ 2021-01-14 3:20 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-01-14 3:20 UTC (permalink / raw)
To: Menglong Dong
Cc: kuba, davem, ast, andriin, daniel, edumazet, ap420073,
xiyou.wangcong, jiri, bjorn.topel, netdev, linux-kernel,
dong.menglong
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Mon, 11 Jan 2021 02:42:21 -0800 you wrote:
> From: Menglong Dong <dong.menglong@zte.com.cn>
>
> Replace the check for ETH_P_8021Q and ETH_P_8021AD in
> __netif_receive_skb_core with eth_type_vlan.
>
> Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
>
> [...]
Here is the summary with links:
- [net-next] net: core: use eth_type_vlan in __netif_receive_skb_core
https://git.kernel.org/netdev/net-next/c/324cefaf1c72
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-14 3:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-11 10:42 [PATCH net-next] net: core: use eth_type_vlan in __netif_receive_skb_core menglong8.dong
2021-01-14 3: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.