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 net-next:
1) Use array_size() in ebtables, from Gustavo A. R. Silva.
2) Attach IPS_ASSURED to internal UDP stream state, reported by
Maciej Zenczykowski.
3) Add NFT_META_IFTYPE to match on the interface type either
from ingress or egress.
4) Generalize pktinfo->tprot_set to flags field.
5) Allow to match on inner headers / payload data.
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/net/netfilter/nf_tables.h 8 additions, 2 deletionsinclude/net/netfilter/nf_tables.h
- include/net/netfilter/nf_tables_ipv4.h 4 additions, 3 deletionsinclude/net/netfilter/nf_tables_ipv4.h
- include/net/netfilter/nf_tables_ipv6.h 3 additions, 3 deletionsinclude/net/netfilter/nf_tables_ipv6.h
- include/uapi/linux/netfilter/nf_tables.h 5 additions, 1 deletioninclude/uapi/linux/netfilter/nf_tables.h
- net/bridge/netfilter/ebtables.c 4 additions, 3 deletionsnet/bridge/netfilter/ebtables.c
- net/netfilter/nf_conntrack_proto_udp.c 5 additions, 2 deletionsnet/netfilter/nf_conntrack_proto_udp.c
- net/netfilter/nf_tables_core.c 1 addition, 1 deletionnet/netfilter/nf_tables_core.c
- net/netfilter/nf_tables_trace.c 2 additions, 2 deletionsnet/netfilter/nf_tables_trace.c
- net/netfilter/nft_meta.c 6 additions, 2 deletionsnet/netfilter/nft_meta.c
- net/netfilter/nft_payload.c 56 additions, 4 deletionsnet/netfilter/nft_payload.c
Please register or sign in to comment