David S. Miller 40451fd013 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. Basically, more incremental updates for br_netfilter from Florian Westphal, small nf_tables updates (including one fix for rb-tree locking) and small two-liner to add extra validation for the REJECT6 target. More specifically, they are: 1) Use the conntrack status flags from br_netfilter to know that DNAT is happening. Patch for Florian Westphal. 2) nf_bridge->physoutdev == NULL already indicates that the traffic is bridged, so let's get rid of the BRNF_BRIDGED flag. Also from Florian. 3) Another patch to prepare voidization of seq_printf/seq_puts/seq_putc, from Joe Perches. 4) Consolidation of nf_tables_newtable() error path. 5) Kill nf_bridge_pad used by br_netfilter from ip_fragment(), from Florian Westphal. 6) Access rb-tree root node inside the lock and remove unnecessary locking from the get path (we already hold nfnl_lock there), from Patrick McHardy. 7) You cannot use a NFT_SET_ELEM_INTERVAL_END when the set doesn't support interval, also from Patrick. 8) Enforce IP6T_F_PROTO from ip6t_REJECT to make sure the core is actually restricting matches to TCP. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-23 22:02:46 -04:00
..
netfilter	netfilter: fix sparse warnings in reject handling	2015-03-10 15:01:32 +01:00
br.c	net: bridge: add compile-time assert for cb struct size	2015-03-03 14:07:04 -05:00
br_device.c	netfilter: bridge: use rcu hook to resolve br_netfilter dependency	2015-03-10 15:03:02 +01:00
br_fdb.c
br_forward.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-03-09 15:58:21 -04:00
br_if.c	bridge: reset bridge mtu after deleting an interface	2015-03-14 19:12:38 -04:00
br_input.c	bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi	2015-03-05 14:52:23 -05:00
br_ioctl.c
br_mdb.c
br_multicast.c
br_netfilter.c	netfilter: bridge: kill nf_bridge_pad	2015-03-22 19:45:55 +01:00
br_netlink.c	bridge: add ageing_time, stp_state, priority over netlink	2015-03-18 23:21:06 -04:00
br_nf_core.c	net: Remove protocol from struct dst_ops	2015-03-09 16:06:10 -04:00
br_private.h	netfilter: bridge: use rcu hook to resolve br_netfilter dependency	2015-03-10 15:03:02 +01:00
br_private_stp.h
br_stp.c
br_stp_bpdu.c
br_stp_if.c
br_stp_timer.c
br_sysfs_br.c
br_sysfs_if.c	bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi	2015-03-05 14:52:23 -05:00
br_vlan.c
Kconfig
Makefile