David S. Miller e453581dd5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf ...

Pablo Neira Ayuso says:

====================
Netfilter fix for net

The following patch reverts the ebtables chunk that enforces counters that was
introduced in the recently applied d26e2c9ffa ('Revert "netfilter: ensure
number of counters is >0 in do_replace()"') since this breaks ebtables.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-06-01 16:56:43 -07:00

..

netfilter

Revert "netfilter: ensure number of counters is >0 in do_replace()"

2015-06-01 19:45:47 +02: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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-02-09 14:35:57 -08:00

br_forward.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

br_if.c

bridge: reset bridge mtu after deleting an interface

2015-03-14 19:12:38 -04:00

br_input.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

br_ioctl.c

bridge: add space before '(/{', after ',', etc.

2013-12-19 19:27:26 -05:00

br_mdb.c

bridge/mdb: remove wrong use of NLM_F_MULTI

2015-04-29 14:59:16 -04:00

br_multicast.c

bridge: fix br_multicast_query_expired() bug

2015-05-30 23:31:28 -07:00

br_netfilter.c

Revert "netfilter: bridge: query conntrack about skb dnat"

2015-05-20 13:51:25 +02:00

br_netlink.c

bridge/nl: remove wrong use of NLM_F_MULTI

2015-04-29 14:59:16 -04:00

br_nf_core.c

net: Remove protocol from struct dst_ops

2015-03-09 16:06:10 -04:00

br_private_stp.h

net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypes

2013-10-19 19:12:11 -04:00

br_private.h

bridge/nl: remove wrong use of NLM_F_MULTI

2015-04-29 14:59:16 -04:00

br_stp_bpdu.c

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -04:00

br_stp_if.c

net: bridge: add a br_set_state helper function

2014-10-01 22:03:50 -04:00

br_stp_timer.c

bridge: fix lockdep splat

2015-05-22 16:23:56 -04:00

br_stp.c

bridge: call netdev_sw_port_stp_update when bridge port STP status changes

2014-12-02 20:01:22 -08:00

br_sysfs_br.c

bridge: Add a default_pvid sysfs attribute

2014-10-05 21:21:36 -04:00

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

net: rename vlan_tx_* helpers since "tx" is misleading there

2015-01-13 17:51:08 -05:00

br.c

net: bridge: add compile-time assert for cb struct size

2015-03-03 14:07:04 -05:00

Kconfig

bridge: Add vlan filtering infrastructure

2013-02-13 19:41:46 -05:00

Makefile

netfilter: bridge: build br_nf_core only if required

2014-09-30 14:07:51 -04:00