David S. Miller 9b59377b75 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, they are: 1) Release nf_tables objects on netns destructions via nft_release_afinfo(). 2) Destroy basechain and rules on netdevice removal in the new netdev family. 3) Get rid of defensive check against removal of inactive objects in nf_tables. 4) Pass down netns pointer to our existing nfnetlink callbacks, as well as commit() and abort() nfnetlink callbacks. 5) Allow to invert limit expression in nf_tables, so we can throttle overlimit traffic. 6) Add packet duplication for the netdev family. 7) Add forward expression for the netdev family. 8) Define pr_fmt() in conntrack helpers. 9) Don't leave nfqueue configuration on inconsistent state in case of errors, from Ken-ichirou MATSUZAWA, follow up patches are also from him. 10) Skip queue option handling after unbind. 11) Return error on unknown both in nfqueue and nflog command. 12) Autoload ctnetlink when NFQA_CFG_F_CONNTRACK is set. 13) Add new NFTA_SET_USERDATA attribute to store user data in sets, from Carlos Falgueras. 14) Add support for 64 bit byteordering changes nf_tables, from Florian Westphal. 15) Add conntrack byte/packet counter matching support to nf_tables, also from Florian. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2016-01-08 20:53:16 -05:00
..
ipset	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
ipvs	sctp: Rename NETIF_F_SCTP_CSUM to NETIF_F_SCTP_CRC	2015-12-15 16:49:58 -05:00
Kconfig	netfilter: nf_tables: add forward expression to the netdev family	2016-01-04 17:48:38 +01:00
Makefile	netfilter: nf_tables: add forward expression to the netdev family	2016-01-04 17:48:38 +01:00
core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-24 06:54:12 -07:00
nf_conntrack_acct.c	…
nf_conntrack_amanda.c	…
nf_conntrack_broadcast.c	…
nf_conntrack_core.c	netfilter: conntrack: fix crash on timeout object removal	2015-10-12 17:04:34 +02:00
nf_conntrack_ecache.c	…
nf_conntrack_expect.c	netfilter: Set /proc/net entries owner to root in namespace	2015-11-25 13:54:09 +01:00
nf_conntrack_extend.c	…
nf_conntrack_ftp.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_h323_asn1.c	…
nf_conntrack_h323_main.c	ipv6: Remove external dependency on rt6i_gateway and RTF_ANYCAST	2015-05-25 13:25:33 -04:00
nf_conntrack_h323_types.c	…
nf_conntrack_helper.c	…
nf_conntrack_irc.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_l3proto_generic.c	…
nf_conntrack_labels.c	netfilter: connlabels: Export setting connlabel length	2015-08-27 11:40:43 -07:00
nf_conntrack_netbios_ns.c	…
nf_conntrack_netlink.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
nf_conntrack_pptp.c	netfilter: nf_conntrack: push zone object into functions	2015-08-11 12:29:01 +02:00
nf_conntrack_proto.c	…
nf_conntrack_proto_dccp.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_generic.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_gre.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_sctp.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_tcp.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_udp.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_proto_udplite.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
nf_conntrack_sane.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_seqadj.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_conntrack_sip.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_snmp.c	…
nf_conntrack_standalone.c	netfilter: Set /proc/net entries owner to root in namespace	2015-11-25 13:54:09 +01:00
nf_conntrack_tftp.c	netfilter: nf_ct_helper: define pr_fmt()	2016-01-04 17:48:51 +01:00
nf_conntrack_timeout.c	netfilter: cttimeout: add netns support	2015-12-14 12:48:58 +01:00
nf_conntrack_timestamp.c	…
nf_dup_netdev.c	netfilter: nf_tables: add packet duplication to the netdev family	2016-01-03 21:04:23 +01:00
nf_internals.h	netfilter: nf_queue: fix nf_queue_nf_hook_drop()	2015-07-23 16:17:58 +02:00
nf_log.c	netfilter: nf_log: wait for rcu grace after logger unregistration	2015-09-17 13:37:31 +02:00
nf_log_common.c	…
nf_nat_amanda.c	…
nf_nat_core.c	netfilter: Pass net into nf_xfrm_me_harder	2015-09-18 22:00:22 +02:00
nf_nat_ftp.c	…
nf_nat_helper.c	…
nf_nat_irc.c	…
nf_nat_proto_common.c	…
nf_nat_proto_dccp.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_nat_proto_sctp.c	…
nf_nat_proto_tcp.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_nat_proto_udp.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_nat_proto_udplite.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
nf_nat_proto_unknown.c	…
nf_nat_redirect.c	netfilter: nf_nat_redirect: add missing NULL pointer check	2015-10-27 06:54:56 +01:00
nf_nat_sip.c	…
nf_nat_tftp.c	…
nf_queue.c	netfilter: nf_queue: remove rcu_read_lock calls	2015-10-16 18:22:41 +02:00
nf_sockopt.c	…
nf_synproxy_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2015-09-05 21:57:42 -07:00
nf_tables_api.c	netfilter: nf_tables: Add new attributes into nft_set to store user data.	2016-01-08 13:25:08 +01:00
nf_tables_core.c	netfilter: nf_tables: fix nf_log_trace based tracing	2015-12-09 16:53:46 +01:00
nf_tables_inet.c	netfilter: nf_tables: release objects on netns destruction	2015-12-28 18:34:35 +01:00
nf_tables_netdev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2016-01-08 20:53:16 -05:00
nf_tables_trace.c	netfilter: nf_tables: wrap tracing with a static key	2015-12-09 13:23:13 +01:00
nfnetlink.c	netfilter: nfnetlink: pass down netns pointer to commit() and abort() callbacks	2015-12-28 18:43:15 +01:00
nfnetlink_acct.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
nfnetlink_cthelper.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
nfnetlink_cttimeout.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
nfnetlink_log.c	netfilter: nfnetlink_log: just returns error for unknown command	2016-01-08 13:25:07 +01:00
nfnetlink_queue.c	netfilter: nfnetlink_queue: autoload nf_conntrack_netlink module NFQA_CFG_F_CONNTRACK config flag	2016-01-08 13:25:06 +01:00
nft_bitwise.c	netfilter: nf_tables: support variable sized data in nft_data_init()	2015-04-13 17:17:30 +02:00
nft_byteorder.c	netfilter: nft_byteorder: provide 64bit le/be conversion	2016-01-08 13:32:11 +01:00
nft_cmp.c	netfilter: nf_tables: support variable sized data in nft_data_init()	2015-04-13 17:17:30 +02:00
nft_compat.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
nft_counter.c	netfilter: nf_tables: add clone interface to expression operations	2015-11-10 23:47:32 +01:00
nft_ct.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2016-01-08 20:53:16 -05:00
nft_dup_netdev.c	netfilter: nf_tables: add packet duplication to the netdev family	2016-01-03 21:04:23 +01:00
nft_dynset.c	netfilter: nf_tables: add clone interface to expression operations	2015-11-10 23:47:32 +01:00
nft_exthdr.c	netfilter: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02:00
nft_fwd_netdev.c	netfilter: nf_tables: add forward expression to the netdev family	2016-01-04 17:48:38 +01:00
nft_hash.c	netfilter: nf_tables: variable sized set element keys / data	2015-04-13 17:17:31 +02:00
nft_immediate.c	netfilter: nf_tables: support variable sized data in nft_data_init()	2015-04-13 17:17:30 +02:00
nft_limit.c	netfilter: nft_limit: allow to invert matching criteria	2016-01-03 20:58:52 +01:00
nft_log.c	netfilter: nf_tables: Use pkt->net instead of computing net from the passed net_devices	2015-09-18 21:58:49 +02:00
nft_lookup.c	netfilter: nf_tables: add flag to indicate set contains expressions	2015-04-13 20:12:32 +02:00
nft_masq.c	…
nft_meta.c	netfilter: meta: add support for setting skb->pkttype	2015-12-18 14:12:56 +01:00
nft_nat.c	netfilter: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02:00
nft_payload.c	netfilter: nft_payload: add packet mangling support	2015-11-25 13:54:51 +01:00
nft_queue.c	netfilter: nf_tables: kill nft_pktinfo.ops	2015-09-18 21:58:01 +02:00
nft_rbtree.c	netfilter: nf_tables: variable sized set element keys / data	2015-04-13 17:17:31 +02:00
nft_redir.c	netfilter: nf_tables: add register parsing/dumping helpers	2015-04-13 17:17:28 +02:00
nft_reject.c	netfilter; Add some missing default cases to switch statements in nft_reject.	2015-04-27 13:20:34 -04:00
nft_reject_inet.c	ipv4: Push struct net down into nf_send_reset	2015-09-29 20:21:31 +02:00
x_tables.c	netfilter: Set /proc/net entries owner to root in namespace	2015-11-25 13:54:09 +01:00
xt_AUDIT.c	…
xt_CHECKSUM.c	…
xt_CLASSIFY.c	…
xt_CONNSECMARK.c	…
xt_CT.c	netfilter: cttimeout: add netns support	2015-12-14 12:48:58 +01:00
xt_DSCP.c	…
xt_HL.c	…
xt_HMARK.c	…
xt_IDLETIMER.c	netfilter: IDLETIMER: fix lockdep warning	2015-07-13 17:23:25 +02:00
xt_LED.c	…
xt_LOG.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_NETMAP.c	…
xt_NFLOG.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_NFQUEUE.c	…
xt_RATEEST.c	…
xt_REDIRECT.c	…
xt_SECMARK.c	…
xt_TCPMSS.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_TCPOPTSTRIP.c	net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool	2015-08-17 21:33:06 -07:00
xt_TEE.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf	2015-11-04 20:47:50 -05:00
xt_TPROXY.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_TRACE.c	…
xt_addrtype.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_bpf.c	…
xt_cgroup.c	netfilter: implement xt_cgroup cgroup2 path match	2015-12-14 20:34:55 +01:00
xt_cluster.c	…
xt_comment.c	…
xt_connbytes.c	…
xt_connlabel.c	netfilter: connlabels: Export setting connlabel length	2015-08-27 11:40:43 -07:00
xt_connlimit.c	netfilter: nf_conntrack: Add a struct net parameter to l4_pkt_to_tuple	2015-09-18 22:00:04 +02:00
xt_connmark.c	…
xt_conntrack.c	…
xt_cpu.c	…
xt_dccp.c	…
xt_devgroup.c	…
xt_dscp.c	…
xt_ecn.c	…
xt_esp.c	…
xt_hashlimit.c	…
xt_helper.c	…
xt_hl.c	…
xt_ipcomp.c	…
xt_iprange.c	…
xt_ipvs.c	ipvs: Pass ipvs into conn_out_get	2015-09-24 09:34:41 +09:00
xt_l2tp.c	…
xt_length.c	…
xt_limit.c	…
xt_mac.c	…
xt_mark.c	netfilter: xt_MARK: Add ARP support	2015-05-14 13:00:27 +02:00
xt_multiport.c	…
xt_nat.c	…
xt_nfacct.c	netfilter: nfacct: per network namespace support	2015-08-07 11:50:56 +02:00
xt_osf.c	netfilter: nfnetlink: pass down netns pointer to call() and call_rcu()	2015-12-28 18:41:41 +01:00
xt_owner.c	netfilter: xt_owner: use skb_to_full_sk() helper	2015-11-08 20:56:39 -05:00
xt_physdev.c	…
xt_pkttype.c	…
xt_policy.c	…
xt_quota.c	…
xt_rateest.c	…
xt_realm.c	…
xt_recent.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_repldata.h	…
xt_sctp.c	…
xt_set.c	netfilter: ipset: Fix coding styles reported by checkpatch.pl	2015-06-14 10:40:18 +02:00
xt_socket.c	netfilter: x_tables: Use par->net instead of computing from the passed net devices	2015-09-18 21:58:25 +02:00
xt_state.c	…
xt_statistic.c	…
xt_string.c	…
xt_tcpmss.c	…
xt_tcpudp.c	…
xt_time.c	…
xt_u32.c	…