| 1 |
commit: f3997db2fc476258099dc8e26d746269caa81dca |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jun 26 06:54:48 2020 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 27 20:49:00 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3997db2 |
| 7 |
|
| 8 |
net-misc/openvswitch: remove unused patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.101, Repoman-2.3.22 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/16428 |
| 13 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 14 |
|
| 15 |
...nntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch | 46 ---------------------- |
| 16 |
1 file changed, 46 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index 1f77ab54b0a..00000000000 |
| 21 |
--- a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,46 +0,0 @@ |
| 24 |
-From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001 |
| 25 |
-From: Yousong Zhou <zhouyousong@×××××××××.com> |
| 26 |
-Date: Fri, 3 May 2019 15:03:24 +0000 |
| 27 |
-Subject: [PATCH 5/5] datapath: conntrack: fix include for |
| 28 |
- IP6_DEFRAG_CONNTRACK_IN |
| 29 |
- |
| 30 |
-The enum definition is now inside include/net/ipv6_frag.h since upstream commit |
| 31 |
-70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was |
| 32 |
-backported to stable trees (4.9, 4.14, 4.19) only these days. |
| 33 |
- |
| 34 |
-The error message |
| 35 |
- |
| 36 |
- 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 |
| 37 |
- /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': |
| 38 |
- /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 |
| 39 |
- enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; |
| 40 |
- ^~~~~~~~~~~~~~~~ |
| 41 |
- /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'? |
| 42 |
- enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; |
| 43 |
- ^~~~~~~~~~~~~~~~~~~~~~~ |
| 44 |
- IP_DEFRAG_CONNTRACK_IN |
| 45 |
- /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 |
| 46 |
- /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 |
| 47 |
- enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; |
| 48 |
- ^~~~ |
| 49 |
- /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] |
| 50 |
- 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 |
| 51 |
- |
| 52 |
-Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090 |
| 53 |
-Signed-off-by: Yousong Zhou <zhouyousong@×××××××××.com> |
| 54 |
---- |
| 55 |
- datapath/conntrack.c | 1 + |
| 56 |
- 1 file changed, 1 insertion(+) |
| 57 |
- |
| 58 |
-diff --git a/datapath/conntrack.c b/datapath/conntrack.c |
| 59 |
-index a7dc9e0c3..69bda5a9c 100644 |
| 60 |
---- a/datapath/conntrack.c |
| 61 |
-+++ b/datapath/conntrack.c |
| 62 |
-@@ -31,6 +31,7 @@ |
| 63 |
- #include <net/netfilter/nf_conntrack_seqadj.h> |
| 64 |
- #include <net/netfilter/nf_conntrack_zones.h> |
| 65 |
- #include <net/netfilter/ipv6/nf_defrag_ipv6.h> |
| 66 |
-+#include <net/ipv6_frag.h> |
| 67 |
- |
| 68 |
- #ifdef CONFIG_NF_NAT_NEEDED |
| 69 |
- #include <linux/netfilter/nf_nat.h> |
Archives