Pablo Neira Ayuso aadd51aa71 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...

Resolve conflicts between 5888b93 ("Merge branch 'nf-hook-compress'") and
Florian Westphal br_netfilter works.

Conflicts:
        net/bridge/br_netfilter.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2015-04-08 18:30:21 +02:00

..

netfilter

netfilter: Pass nf_hook_state through nft_set_pktinfo*().

2015-04-04 12:54:27 -04: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

netlink: make nlmsg_end() and genlmsg_end() void

2015-01-18 01:03:45 -05:00

br_multicast.c

netfilter: Pass socket pointer down through okfn().

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

br_netfilter.c

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

2015-04-08 18:30:21 +02:00

br_netlink.c

dev: introduce dev_get_iflink()

2015-04-02 14:04:59 -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

netfilter: Pass socket pointer down through okfn().

2015-04-07 15:25:55 -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

net: bridge: add a br_set_state helper function

2014-10-01 22:03:50 -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