David S. Miller 583d3f5af2 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) default CONFIG_NETFILTER_INGRESS to y for easier compile-testing of all options. 2) Allow to bind a table to net_device. This introduces the internal NFT_AF_NEEDS_DEV flag to perform a mandatory check for this binding. This is required by the next patch. 3) Add the 'netdev' table family, this new table allows you to create ingress filter basechains. This provides access to the existing nf_tables features from ingress. 4) Kill unused argument from compat_find_calc_{match,target} in ip_tables and ip6_tables, from Florian Westphal. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-31 00:02:30 -07:00
..
ipset	netfilter: ipset: deinline ip_set_put_extensions()	2015-05-14 12:51:19 +02:00
ipvs	ipv6: Set FLOWI_FLAG_KNOWN_NH at flowi6_flags	2015-05-25 13:25:34 -04:00
core.c	netfilter: add netfilter ingress hook after handle_ing() under unique static key	2015-05-14 01:10:05 -04:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-05-31 00:02:30 -07:00
Makefile	netfilter: nf_tables: add netdev table to filter from ingress	2015-05-26 18:41:23 +02:00
nf_conntrack_acct.c	netfilter: Remove uses of seq_<foo> return values	2015-03-18 10:51:35 +01:00
nf_conntrack_amanda.c	net: Remove state argument from skb_find_text()	2015-02-22 15:59:54 -05:00
nf_conntrack_broadcast.c
nf_conntrack_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-01-15 01:50:25 -05:00
nf_conntrack_ecache.c	netfilter: conntrack: remove timer from ecache extension	2014-06-25 19:15:38 +02:00
nf_conntrack_expect.c	netfilter: Remove uses of seq_<foo> return values	2015-03-18 10:51:35 +01:00
nf_conntrack_extend.c
nf_conntrack_ftp.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02: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	netfilter: fix spelling errors	2014-10-30 17:35:30 +01:00
nf_conntrack_irc.c
nf_conntrack_l3proto_generic.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_labels.c
nf_conntrack_netbios_ns.c
nf_conntrack_netlink.c	netfilter: conntrack: Flush connections with a given mark	2015-01-08 12:14:20 +01:00
nf_conntrack_pptp.c	netfilter: nf_conntrack: flush net_gre->keymap_list only from gre helper	2014-04-08 10:56:12 +02:00
nf_conntrack_proto.c
nf_conntrack_proto_dccp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_generic.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_gre.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_sctp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_tcp.c	conntrack: RFC5961 challenge ACK confuse conntrack LAST-ACK transition	2015-05-15 20:50:56 +02:00
nf_conntrack_proto_udp.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_proto_udplite.c	netfilter: Convert print_tuple functions to return void	2014-11-05 14:10:33 -05:00
nf_conntrack_sane.c
nf_conntrack_seqadj.c	netfilter: nf_ct_seqadj: print ack seq in the right host byte order	2015-01-05 13:52:20 +01:00
nf_conntrack_sip.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
nf_conntrack_snmp.c
nf_conntrack_standalone.c	netfilter: Remove checks of seq_printf() return values	2014-11-05 14:11:02 -05:00
nf_conntrack_tftp.c
nf_conntrack_timeout.c
nf_conntrack_timestamp.c
nf_internals.h	netfilter: Create and use nf_hook_state.	2015-04-04 12:17:40 -04:00
nf_log.c	netfilter: restore rule tracing via nfnetlink_log	2015-03-19 11:14:48 +01:00
nf_log_common.c	netfilter: bridge: add helpers for fetching physin/outdev	2015-04-08 16:49:08 +02:00
nf_nat_amanda.c
nf_nat_core.c	net: use reciprocal_scale() helper	2014-08-23 12:21:21 -07:00
nf_nat_ftp.c
nf_nat_helper.c
nf_nat_irc.c
nf_nat_proto_common.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_dccp.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_sctp.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_tcp.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_udp.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_udplite.c	netfilter: use IS_ENABLED() macro	2014-06-30 11:38:03 +02:00
nf_nat_proto_unknown.c
nf_nat_redirect.c	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
nf_nat_sip.c	netfilter: replace strnicmp with strncasecmp	2014-10-14 02:18:24 +02:00
nf_nat_tftp.c
nf_queue.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-04-08 18:30:21 +02:00
nf_sockopt.c	netfilter: don't use mutex_lock_interruptible()	2014-08-08 16:47:23 +02:00
nf_synproxy_core.c	netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt	2014-02-05 17:46:06 +01:00
nf_tables_api.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-05-31 00:02:30 -07:00
nf_tables_core.c	netfilter: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02:00
nf_tables_inet.c
nf_tables_netdev.c	netfilter: nf_tables: add netdev table to filter from ingress	2015-05-26 18:41:23 +02:00
nfnetlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-01-15 01:50:25 -05:00
nfnetlink_acct.c	netfilter: nfnetlink_acct: add filter support to nfacct counter list/reset	2014-08-26 21:36:19 +02:00
nfnetlink_cthelper.c	netfilter: Zero the tuple in nfnl_cthelper_parse_tuple()	2015-03-12 13:07:36 +01:00
nfnetlink_cttimeout.c
nfnetlink_log.c	netfilter: nfnetlink_{log,queue}: Register pernet in first place	2015-05-20 13:46:48 +02:00
nfnetlink_queue_core.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-23 01:22:35 -04:00
nfnetlink_queue_ct.c
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: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02: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: x_tables: add context to know if extension runs from nft_compat	2015-05-15 20:14:07 +02:00
nft_counter.c	netfilter: nf_tables: mark stateful expressions	2015-04-13 20:12:31 +02:00
nft_ct.c	netfilter: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02:00
nft_dynset.c	netfilter: nft_dynset: dynamic stateful expression instantiation	2015-04-13 20:19:55 +02:00
nft_exthdr.c	netfilter: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02: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: nf_tables: mark stateful expressions	2015-04-13 20:12:31 +02:00
nft_log.c	netfilter: nf_tables: get rid of NFT_REG_VERDICT usage	2015-04-13 17:17:07 +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	netfilter: nf_tables: validate hooks in NAT expressions	2015-01-19 14:52:39 +01:00
nft_meta.c	netfilter: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02: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: nf_tables: switch registers to 32 bit addressing	2015-04-13 17:17:29 +02:00
nft_queue.c	netfilter: nf_tables: get rid of NFT_REG_VERDICT usage	2015-04-13 17:17:07 +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	netfilter; Add some missing default cases to switch statements in nft_reject.	2015-04-27 13:20:34 -04:00
x_tables.c	netfilter: Use correct return for seq_show functions	2015-05-17 17:25:35 +02:00
xt_addrtype.c	ipv6: Remove external dependency on rt6i_gateway and RTF_ANYCAST	2015-05-25 13:25:33 -04:00
xt_AUDIT.c	netfilter: Convert uses of __constant_<foo> to <foo>	2014-03-13 14:13:19 +01:00
xt_bpf.c	net: filter: split 'struct sk_filter' into socket and bpf parts	2014-08-02 15:03:58 -07:00
xt_cgroup.c	netfilter: x_tables: fix cgroup matching on non-full sks	2015-04-01 11:26:42 +02:00
xt_CHECKSUM.c
xt_CLASSIFY.c
xt_cluster.c	net: use reciprocal_scale() helper	2014-08-23 12:21:21 -07:00
xt_comment.c
xt_connbytes.c	netfilter: Convert pr_warning to pr_warn	2014-09-10 12:40:10 -07:00
xt_connlabel.c
xt_connlimit.c	netfilter: xt_connlimit: honor conntrack zone if available	2014-11-17 12:44:20 +01:00
xt_connmark.c
xt_CONNSECMARK.c
xt_conntrack.c
xt_cpu.c
xt_CT.c	netfilter: nf_conntrack: don't release a conntrack with non-zero refcnt	2014-02-05 17:46:06 +01:00
xt_dccp.c
xt_devgroup.c
xt_dscp.c
xt_DSCP.c	netfilter: fix various sparse warnings	2014-11-13 12:14:42 +01:00
xt_ecn.c
xt_esp.c
xt_hashlimit.c	netfilter: Remove checks of seq_printf() return values	2014-11-05 14:11:02 -05:00
xt_helper.c
xt_hl.c
xt_HL.c
xt_HMARK.c	net: use reciprocal_scale() helper	2014-08-23 12:21:21 -07:00
xt_IDLETIMER.c
xt_ipcomp.c	netfilter: xt_ipcomp: Use ntohs to ease sparse warning	2014-02-19 11:41:25 +01:00
xt_iprange.c
xt_ipvs.c
xt_l2tp.c
xt_LED.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-05 18:46:26 -07:00
xt_length.c
xt_limit.c
xt_LOG.c	netfilter: xt_LOG: add missing string format in nf_log_packet()	2014-06-28 18:50:35 +02:00
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_NETMAP.c
xt_nfacct.c	netfilter: nfnetlink_acct: Adding quota support to accounting framework	2014-04-29 18:25:14 +02:00
xt_NFLOG.c
xt_NFQUEUE.c
xt_osf.c	netfilter: xt_osf: Use continue to reduce indentation	2014-12-23 14:20:10 +01:00
xt_owner.c
xt_physdev.c	netfilter: physdev: use helpers	2015-04-08 16:49:09 +02:00
xt_pkttype.c
xt_policy.c
xt_quota.c
xt_RATEEST.c	net: sched: make bstats per cpu and estimator RCU safe	2014-09-30 01:02:26 -04:00
xt_rateest.c
xt_realm.c
xt_recent.c	netfilter: xt_recent: don't reject rule if new hitcount exceeds table max	2015-02-16 17:00:47 +01:00
xt_REDIRECT.c	netfilter: combine IPv4 and IPv6 nf_nat_redirect code in one module	2014-11-27 13:08:42 +01:00
xt_repldata.h	net: netfilter: LLVMLinux: vlais-netfilter	2014-06-07 11:44:39 -07:00
xt_sctp.c
xt_SECMARK.c
xt_set.c	netfilter: ipset: Use better include files in xt_set.c	2015-05-13 18:21:13 +02:00
xt_socket.c	netfilter: x_tables: don't extract flow keys on early demuxed sks in socket match	2015-04-08 16:47:49 +02:00
xt_state.c
xt_statistic.c
xt_string.c	net: Remove state argument from skb_find_text()	2015-02-22 15:59:54 -05:00
xt_TCPMSS.c	netfilter: x_tables: add context to know if extension runs from nft_compat	2015-05-15 20:14:07 +02:00
xt_tcpmss.c
xt_TCPOPTSTRIP.c
xt_tcpudp.c
xt_TEE.c	ipv6: Set FLOWI_FLAG_KNOWN_NH at flowi6_flags	2015-05-25 13:25:34 -04:00
xt_time.c
xt_TPROXY.c	tcp/dccp: get rid of central timewait timer	2015-04-13 16:40:05 -04:00
xt_TRACE.c
xt_u32.c