LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] samples: bpf: xdp1: remove duplicate code to find protocol
@ 2021-08-08 12:24 Muhammad Falak R Wani
  2021-08-08 16:53 ` Yonghong Song
  0 siblings, 1 reply; 4+ messages in thread
From: Muhammad Falak R Wani @ 2021-08-08 12:24 UTC (permalink / raw)
  To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko
  Cc: bpf, netdev, KP Singh, Yonghong Song, Song Liu, Martin KaFai Lau,
	John Fastabend, Jesper Dangaard Brouer, Jakub Kicinski,
	David S . Miller, linux-kernel, Muhammad Falak R Wani

The code to find h_vlan_encapsulated_proto is duplicated.
Remove the extra block.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 samples/bpf/xdp1_kern.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/samples/bpf/xdp1_kern.c b/samples/bpf/xdp1_kern.c
index 34b64394ed9c..a35e064d7726 100644
--- a/samples/bpf/xdp1_kern.c
+++ b/samples/bpf/xdp1_kern.c
@@ -57,15 +57,6 @@ int xdp_prog1(struct xdp_md *ctx)
 
 	h_proto = eth->h_proto;
 
-	if (h_proto == htons(ETH_P_8021Q) || h_proto == htons(ETH_P_8021AD)) {
-		struct vlan_hdr *vhdr;
-
-		vhdr = data + nh_off;
-		nh_off += sizeof(struct vlan_hdr);
-		if (data + nh_off > data_end)
-			return rc;
-		h_proto = vhdr->h_vlan_encapsulated_proto;
-	}
 	if (h_proto == htons(ETH_P_8021Q) || h_proto == htons(ETH_P_8021AD)) {
 		struct vlan_hdr *vhdr;
 
-- 
2.17.1


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

end of thread, other threads:[~2021-08-09  0:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-08 12:24 [PATCH] samples: bpf: xdp1: remove duplicate code to find protocol Muhammad Falak R Wani
2021-08-08 16:53 ` Yonghong Song
2021-08-08 17:19   ` Muhammad Falak Reyaz
2021-08-09  0:01     ` Yonghong Song

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).