BPF Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH net-next] net: core: use eth_type_vlan in tap_get_user_xdp
@ 2021-01-14  7:44 menglong8.dong
  2021-01-15  2:21 ` Jakub Kicinski
  0 siblings, 1 reply; 2+ messages in thread
From: menglong8.dong @ 2021-01-14  7:44 UTC (permalink / raw)
  To: ast
  Cc: davem, kuba, daniel, hawk, john.fastabend, netdev, linux-kernel,
	bpf, Menglong Dong

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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] net: core: use eth_type_vlan in tap_get_user_xdp
  2021-01-14  7:44 [PATCH net-next] net: core: use eth_type_vlan in tap_get_user_xdp menglong8.dong
@ 2021-01-15  2:21 ` Jakub Kicinski
  0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2021-01-15  2:21 UTC (permalink / raw)
  To: menglong8.dong
  Cc: ast, davem, daniel, hawk, john.fastabend, netdev, linux-kernel,
	bpf, Menglong Dong

On Wed, 13 Jan 2021 23:44:36 -0800 menglong8.dong@gmail.com wrote:
> 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>

Similarly to bridge, please convert all the instances in tap in one
patch.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-14  7:44 [PATCH net-next] net: core: use eth_type_vlan in tap_get_user_xdp menglong8.dong
2021-01-15  2:21 ` Jakub Kicinski

BPF Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/bpf/0 bpf/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 bpf bpf/ https://lore.kernel.org/bpf \
		bpf@vger.kernel.org
	public-inbox-index bpf

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.bpf


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git