diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-27 09:17:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-27 09:17:43 -0500 |
| commit | 4ca257eed6adf58d325c39c320a06dbcd34c43db (patch) | |
| tree | d9fd5197a37746f4b0622ed162dccc26a8f26519 /include | |
| parent | 51fb60eb162ab84c5edf2ae9c63cf0b878e5547e (diff) | |
| parent | 13aa5a8f498dacd5f1a8e35be72af47e630fb8c6 (diff) | |
| download | linux-4ca257eed6adf58d325c39c320a06dbcd34c43db.tar.gz linux-4ca257eed6adf58d325c39c320a06dbcd34c43db.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains netfilter fixes for you net tree,
they are:
1) Missing ct zone size in the nft_ct initialization path, patch
from Florian Westphal.
2) Two patches for netfilter uapi headers, one to remove unnecessary
sysctl.h inclusion and another to fix compilation of xt_hashlimit.h
in userspace, from Dmitry V. Levin.
3) Patch to fix a sloppy change in nf_ct_expect that incorrectly
simplified nf_ct_expect_related_report() in the previous nf-next
batch. This also includes another patch for __nf_ct_expect_check()
to report success by returning 0 to keep it consistent with other
existing functions. From Jarno Rajahalme.
4) The ->walk() iterator of the new bitmap set type goes over the real
bitmap size, this results in incorrect dumps when NFTA_SET_USERDATA
is used.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/netfilter.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/netfilter/xt_hashlimit.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/netfilter.h b/include/uapi/linux/netfilter.h index 7550e9176a54..c111a91adcc0 100644 --- a/include/uapi/linux/netfilter.h +++ b/include/uapi/linux/netfilter.h @@ -3,7 +3,6 @@ #include <linux/types.h> #include <linux/compiler.h> -#include <linux/sysctl.h> #include <linux/in.h> #include <linux/in6.h> diff --git a/include/uapi/linux/netfilter/xt_hashlimit.h b/include/uapi/linux/netfilter/xt_hashlimit.h index 3efc0ca18345..79da349f1060 100644 --- a/include/uapi/linux/netfilter/xt_hashlimit.h +++ b/include/uapi/linux/netfilter/xt_hashlimit.h @@ -2,6 +2,7 @@ #define _UAPI_XT_HASHLIMIT_H #include <linux/types.h> +#include <linux/limits.h> #include <linux/if.h> /* timings are in milliseconds. */ |