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 updates for your net-next tree, they are: 1) Use kvfree() helper function from x_tables, from Eric Dumazet. 2) Remove extra timer from the conntrack ecache extension, use a workqueue instead to redeliver lost events to userspace instead, from Florian Westphal. 3) Removal of the ulog targets for ebtables and iptables. The nflog infrastructure superseded this almost 9 years ago, time to get rid of this code. 4) Replace the list of loggers by an array now that we can only have two possible non-overlapping logger flavours, ie. kernel ring buffer and netlink logging. 5) Move Eric Dumazet's log buffer code to nf_log to reuse it from all of the supported per-family loggers. 6) Consolidate nf_log_packet() as an unified interface for packet logging. After this patch, if the struct nf_loginfo is available, it exp...
Showing
- include/net/netfilter/nf_conntrack_ecache.h 24 additions, 2 deletionsinclude/net/netfilter/nf_conntrack_ecache.h
- include/net/netfilter/nf_log.h 36 additions, 6 deletionsinclude/net/netfilter/nf_log.h
- include/net/netfilter/xt_log.h 0 additions, 54 deletionsinclude/net/netfilter/xt_log.h
- include/net/netns/conntrack.h 5 additions, 1 deletioninclude/net/netns/conntrack.h
- include/uapi/linux/netfilter/nf_tables.h 4 additions, 0 deletionsinclude/uapi/linux/netfilter/nf_tables.h
- include/uapi/linux/netfilter_bridge/Kbuild 0 additions, 1 deletioninclude/uapi/linux/netfilter_bridge/Kbuild
- include/uapi/linux/netfilter_bridge/ebt_ulog.h 0 additions, 38 deletionsinclude/uapi/linux/netfilter_bridge/ebt_ulog.h
- include/uapi/linux/netfilter_ipv4/Kbuild 0 additions, 1 deletioninclude/uapi/linux/netfilter_ipv4/Kbuild
- include/uapi/linux/netfilter_ipv4/ipt_ULOG.h 0 additions, 49 deletionsinclude/uapi/linux/netfilter_ipv4/ipt_ULOG.h
- net/bridge/netfilter/Kconfig 3 additions, 16 deletionsnet/bridge/netfilter/Kconfig
- net/bridge/netfilter/Makefile 3 additions, 0 deletionsnet/bridge/netfilter/Makefile
- net/bridge/netfilter/ebt_log.c 5 additions, 42 deletionsnet/bridge/netfilter/ebt_log.c
- net/bridge/netfilter/ebt_ulog.c 0 additions, 393 deletionsnet/bridge/netfilter/ebt_ulog.c
- net/bridge/netfilter/nf_log_bridge.c 96 additions, 0 deletionsnet/bridge/netfilter/nf_log_bridge.c
- net/ipv4/netfilter/Kconfig 10 additions, 19 deletionsnet/ipv4/netfilter/Kconfig
- net/ipv4/netfilter/Makefile 4 additions, 0 deletionsnet/ipv4/netfilter/Makefile
- net/ipv4/netfilter/ipt_ULOG.c 0 additions, 498 deletionsnet/ipv4/netfilter/ipt_ULOG.c
- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c 2 additions, 2 deletionsnet/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
- net/ipv4/netfilter/nf_conntrack_proto_icmp.c 2 additions, 2 deletionsnet/ipv4/netfilter/nf_conntrack_proto_icmp.c
- net/ipv4/netfilter/nf_defrag_ipv4.c 4 additions, 4 deletionsnet/ipv4/netfilter/nf_defrag_ipv4.c
Please register or sign in to comment