From: menglong8.dong@gmail.com
To: ast@kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, daniel@iogearbox.net,
hawk@kernel.org, john.fastabend@gmail.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org, Menglong Dong <dong.menglong@zte.com.cn>
Subject: [PATCH net-next] net: core: use eth_type_vlan in tap_get_user_xdp
Date: Wed, 13 Jan 2021 23:44:36 -0800 [thread overview]
Message-ID: <20210114074436.6268-1-dong.menglong@zte.com.cn> (raw)
From: Menglong Dong <dong.menglong@zte.com.cn>
Replace the check for ETH_P_8021Q and ETH_P_8021AD in
tap_get_user_xdp with eth_type_vlan.
Signed-off-by: Menglong Dong <dong.menglong@zte.com.cn>
---
drivers/net/tap.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 3c652c8ac5ba..e007583b5bd1 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -1164,8 +1164,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
next reply other threads:[~2021-01-14 7:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 7:44 menglong8.dong [this message]
2021-01-15 2:21 ` [PATCH net-next] net: core: use eth_type_vlan in tap_get_user_xdp Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210114074436.6268-1-dong.menglong@zte.com.cn \
--to=menglong8.dong@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dong.menglong@zte.com.cn \
--cc=hawk@kernel.org \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).