diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-14 11:42:56 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2020-01-14 11:42:56 +0000 |
| commit | cf1fe262fdd1fa284ac17eba53bdc957a510b1e2 (patch) | |
| tree | bf3d5bc8d49b04baeed607edd61fe2d9e0b95eb5 /user/libnftnl/nft-flowtable-test.patch | |
| parent | fd785aca5b4fbf8d3b1823db182c0cc83b208e00 (diff) | |
| download | packages-cf1fe262fdd1fa284ac17eba53bdc957a510b1e2.tar.gz packages-cf1fe262fdd1fa284ac17eba53bdc957a510b1e2.tar.bz2 packages-cf1fe262fdd1fa284ac17eba53bdc957a510b1e2.tar.xz packages-cf1fe262fdd1fa284ac17eba53bdc957a510b1e2.zip | |
user/libnftnl: Bump to 1.1.5
Diffstat (limited to 'user/libnftnl/nft-flowtable-test.patch')
| -rw-r--r-- | user/libnftnl/nft-flowtable-test.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/user/libnftnl/nft-flowtable-test.patch b/user/libnftnl/nft-flowtable-test.patch new file mode 100644 index 000000000..719c1f2cf --- /dev/null +++ b/user/libnftnl/nft-flowtable-test.patch @@ -0,0 +1,37 @@ +From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Mon, 2 Dec 2019 18:29:56 +0100 +Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE + +Marshalling code around that attribute has been dropped by commit +d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is +lost during the test. + +Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a +later point, leave the test code in place but just comment it out. + +Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") +Signed-off-by: Phil Sutter <phil@nwl.cc> +Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + tests/nft-flowtable-test.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c +index 3edb00d..8ab8d4c 100644 +--- a/tests/nft-flowtable-test.c ++++ b/tests/nft-flowtable-test.c +@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE)) + print_err("Flowtable use mismatches"); ++#if 0 + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE)) + print_err("Flowtable size mismatches"); ++#endif + if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) != + nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS)) + print_err("Flowtable flags mismatches"); +-- +2.24.1 |