diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-10 23:01:09 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-10 23:01:09 +0400 |
| commit | 7b6fa1eef68591b0ba27f16c149180ce1cf7047f (patch) | |
| tree | a579c2df0360e0471d9981a22e34c0ce9c5d5fbb /include/uapi | |
| parent | 4511a4a50e1a8757f771681c3e92dbf5a928eeac (diff) | |
| parent | f0d1f04f0a2f662b6b617e24d115fddcf6ef8723 (diff) | |
| download | linux-7b6fa1eef68591b0ba27f16c149180ce1cf7047f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter fixes for net-next
This batch contains two fixes for what you have in your net-next,
they are:
1) Remove nf_send_reset6() from header file. This function now resides
in the nf_reject_ipv6 module. Reported by Eric Dumazet.
2) Fix wrong NFT_REJECT_ICMPX_MAX definition and adjust code to fix
errors reported by Dan Carpenter's static analysis tools.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/netfilter/nf_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index c26df6787fb0..f31fe7b660a5 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -774,7 +774,7 @@ enum nft_reject_inet_code { NFT_REJECT_ICMPX_ADMIN_PROHIBITED, __NFT_REJECT_ICMPX_MAX }; -#define NFT_REJECT_ICMPX_MAX (__NFT_REJECT_ICMPX_MAX + 1) +#define NFT_REJECT_ICMPX_MAX (__NFT_REJECT_ICMPX_MAX - 1) /** * enum nft_reject_attributes - nf_tables reject expression netlink attributes |