From: Til Kaiser Date: Sun, 27 Oct 2024 13:05:50 +0000 (+0100) Subject: xdp-tools: re-add vlan_hdr struct X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5fdd18243eecf405737939bde553e14b6eec0043;p=openwrt%2Fstaging%2Fblocktrron.git xdp-tools: re-add vlan_hdr struct Drop the patch to re-add the vlan_hdr struct because it is required now to build xdp-filter. Signed-off-by: Til Kaiser Link: https://github.com/openwrt/openwrt/pull/16798 Signed-off-by: Christian Marangi --- diff --git a/package/network/utils/xdp-tools/patches/021-headers-xdp-drop-vlan_hdr-as-already-defined.patch b/package/network/utils/xdp-tools/patches/021-headers-xdp-drop-vlan_hdr-as-already-defined.patch deleted file mode 100644 index d508e489ea..0000000000 --- a/package/network/utils/xdp-tools/patches/021-headers-xdp-drop-vlan_hdr-as-already-defined.patch +++ /dev/null @@ -1,31 +0,0 @@ -From bc2a11227b5bed29d33926d5ff7e707228db9e87 Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Wed, 18 Jan 2023 20:07:58 +0100 -Subject: [PATCH] headers: xdp: drop vlan_hdr as already defined - -Drop vlan_hdr as already defined by bpf headers. - -Signed-off-by: Christian Marangi ---- - headers/xdp/parsing_helpers.h | 10 ---------- - 1 file changed, 10 deletions(-) - ---- a/headers/xdp/parsing_helpers.h -+++ b/headers/xdp/parsing_helpers.h -@@ -33,16 +33,6 @@ struct hdr_cursor { - }; - - /* -- * struct vlan_hdr - vlan header -- * @h_vlan_TCI: priority and VLAN ID -- * @h_vlan_encapsulated_proto: packet type ID or len -- */ --struct vlan_hdr { -- __be16 h_vlan_TCI; -- __be16 h_vlan_encapsulated_proto; --}; -- --/* - * Struct icmphdr_common represents the common part of the icmphdr and icmp6hdr - * structures. - */