diff options
| author |   Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2020-06-26 08:54:48 +0200 |
|---|---|---|
| committer |   Aaron Bauman <bman@gentoo.org> | 2020-06-27 16:49:00 -0400 |
| commit | f3997db2fc476258099dc8e26d746269caa81dca (patch) | |
| tree | 28e529de8c68139f208b73ea2860d5917176b337 /net-misc/openvswitch | |
| parent | dev-libs/libtecla: use HTTPS (diff) | |
| download | gentoo-f3997db2fc476258099dc8e26d746269caa81dca.tar.gz gentoo-f3997db2fc476258099dc8e26d746269caa81dca.tar.bz2 gentoo-f3997db2fc476258099dc8e26d746269caa81dca.zip | |
net-misc/openvswitch: remove unused patch
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16428
Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'net-misc/openvswitch')
| -rw-r--r-- | net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch deleted file mode 100644 index 1f77ab54b0ad..000000000000 --- a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001 -From: Yousong Zhou <zhouyousong@yunionyun.com> -Date: Fri, 3 May 2019 15:03:24 +0000 -Subject: [PATCH 5/5] datapath: conntrack: fix include for - IP6_DEFRAG_CONNTRACK_IN - -The enum definition is now inside include/net/ipv6_frag.h since upstream commit -70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was -backported to stable trees (4.9, 4.14, 4.19) only these days. - -The error message - - CC [M] /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments': - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type - enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; - ^~~~~~~~~~~~~~~~ - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'? - enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; - ^~~~~~~~~~~~~~~~~~~~~~~ - IP_DEFRAG_CONNTRACK_IN - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known - enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; - ^~~~ - /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable] - scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed - -Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090 -Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com> ---- - datapath/conntrack.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/datapath/conntrack.c b/datapath/conntrack.c -index a7dc9e0c3..69bda5a9c 100644 ---- a/datapath/conntrack.c -+++ b/datapath/conntrack.c -@@ -31,6 +31,7 @@ - #include <net/netfilter/nf_conntrack_seqadj.h> - #include <net/netfilter/nf_conntrack_zones.h> - #include <net/netfilter/ipv6/nf_defrag_ipv6.h> -+#include <net/ipv6_frag.h> - - #ifdef CONFIG_NF_NAT_NEEDED - #include <linux/netfilter/nf_nat.h> |