Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for nf-next:
1) Add IPS_HW_OFFLOAD status bit, from Bodong Wang.
2) Remove 128-bit limit on the set element data area, rise it
to 64 bytes.
3) Report EOPNOTSUPP for unsupported NAT types and flags.
4) Set up nft_nat flags from the control plane path.
5) Add helper functions to set up the nf_nat_range2 structure.
6) Add netmap support for nft_nat.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/net/netfilter/nf_tables.h 4 additions, 0 deletionsinclude/net/netfilter/nf_tables.h
- include/uapi/linux/netfilter/nf_conntrack_common.h 6 additions, 2 deletionsinclude/uapi/linux/netfilter/nf_conntrack_common.h
- include/uapi/linux/netfilter/nf_nat.h 3 additions, 1 deletioninclude/uapi/linux/netfilter/nf_nat.h
- net/netfilter/nf_conntrack_standalone.c 3 additions, 1 deletionnet/netfilter/nf_conntrack_standalone.c
- net/netfilter/nf_flow_table_offload.c 3 additions, 0 deletionsnet/netfilter/nf_flow_table_offload.c
- net/netfilter/nf_tables_api.c 26 additions, 12 deletionsnet/netfilter/nf_tables_api.c
- net/netfilter/nft_nat.c 84 additions, 26 deletionsnet/netfilter/nft_nat.c
Loading
Please register or sign in to comment