summaryrefslogtreecommitdiffstats
path: root/net/bridge
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-12-052-48/+92
|\
| * netfilter: nf_tables_bridge: set the pktinfo for IPv4/IPv6 trafficAlvaro Neira2014-11-271-1/+39
| * netfilter: nf_tables_bridge: export nft_reject_ip*hdr_validate functionsAlvaro Neira2014-11-272-47/+53
* | bridge: move private brport flags to if_bridge.h so port drivers can use flagsScott Feldman2014-12-021-10/+0
* | bridge: add API to notify bridge driver of learned FBD on offloaded deviceScott Feldman2014-12-022-2/+92
* | bridge: call netdev_sw_port_stp_update when bridge port STP status changesScott Feldman2014-12-021-0/+7
* | net: make vid as a parameter for ndo_fdb_add/ndo_fdb_delJiri Pirko2014-12-022-37/+6
* | bridge: convert flags in fbd entry into bitfieldsJiri Pirko2014-12-021-3/+3
* | bridge: rename fdb_*_hw to fdb_*_hw_addr to avoid confusionJiri Pirko2014-12-021-7/+7
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-11-291-0/+1
|\ \ | |/ |/|
| * bridge: Add missing policy entry for IFLA_BRPORT_FAST_LEAVEThomas Graf2014-11-261-0/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-11-241-0/+1
|\ \
| * | netfilter: fix various sparse warningsFlorian Westphal2014-11-131-0/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-11-211-2/+1
|\ \ \ | | |/ | |/|
| * | bridge: fix netfilter/NF_BR_LOCAL_OUT for own, locally generated queriesLinus Lüssing2014-11-171-2/+1
* | | vlan: rename __vlan_put_tag to vlan_insert_tag_set_protoJiri Pirko2014-11-211-2/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-11-061-0/+1
|\| |
| * | netfilter: nft_reject_bridge: Fix powerpc build errorGuenter Roeck2014-11-031-0/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-11-014-32/+295
|\| |
| * | netfilter: nft_reject_bridge: restrict reject to prerouting and inputPablo Neira Ayuso2014-10-311-1/+32
| * | netfilter: nft_reject_bridge: don't use IP stack to reject trafficPablo Neira Ayuso2014-10-312-10/+254
| * | netfilter: nf_tables_bridge: update hook_mask to allow {pre,post}routingPablo Neira Ayuso2014-10-311-2/+4
| * | bridge: Do not compile options in br_parse_ip_optionsHerbert Xu2014-10-241-19/+5
| |/
* / bridge: Add support for IEEE 802.11 Proxy ARPKyeyoon Park2014-10-275-1/+71
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-10-082-0/+15
|\
| * bridge: Save frag_max_size between PRE_ROUTING and POST_ROUTINGHerbert Xu2014-10-072-0/+15
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-10-053-5/+97
|\ \
| * | netfilter: explicit module dependency between br_netfilter and physdevPablo Neira Ayuso2014-10-021-0/+5
| * | netfilter: nf_tables: allow to filter from prerouting and postroutingPablo Neira Ayuso2014-10-021-0/+2
| * | netfilter: nft_reject: introduce icmp code abstraction for inet and bridgePablo Neira Ayuso2014-10-021-5/+90
* | | bridge: Add filtering support for default_pvidVlad Yasevich2014-10-054-7/+136
* | | bridge: Simplify pvid checks.Vlad Yasevich2014-10-052-7/+4
* | | bridge: Add a default_pvid sysfs attributeVlad Yasevich2014-10-053-0/+48
* | | net: bridge: add a br_set_state helper functionFlorian Fainelli2014-10-016-11/+17
|/ /
* | netfilter: bridge: build br_nf_core only if requiredFlorian Westphal2014-09-301-2/+3
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-09-2910-119/+137
|\ \
| * | netfilter: bridge: move br_netfilter out of the corePablo Neira Ayuso2014-09-2610-91/+137
| * | netfilter: bridge: nf_bridge_copy_header as static inline in headerPablo Neira Ayuso2014-09-261-28/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-09-232-3/+16
|\ \ \ | |/ / |/| / | |/
| * bridge: Fix br_should_learn to check vlan_enabledVlad Yasevich2014-09-151-1/+1
| * bridge: Allow clearing of pvid and untagged bitmapVlad Yasevich2014-09-131-0/+4
| * bridge: Check if vlan filtering is enabled only once.Vlad Yasevich2014-09-132-4/+13
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2014-09-101-0/+15
|\ \
| * | netfilter: ebtables: create audit records for replacesNicolas Dichtel2014-09-091-0/+15
| |/
* | bridge: Cleanup of unncessary check.Rami Rosen2014-09-091-3/+0
* | bridge: implement rtnl_link_ops->changelinkJiri Pirko2014-09-091-0/+39
* | bridge: implement rtnl_link_ops->get_size and rtnl_link_ops->fill_infoJiri Pirko2014-09-091-0/+25
* | bridge: implement rtnl_link_ops->slave_changelinkJiri Pirko2014-09-091-2/+16
* | bridge: implement rtnl_link_ops->get_slave_size and rtnl_link_ops->fill_slave...Jiri Pirko2014-09-091-6/+21
* | bridge: switch order of rx_handler reg and upper dev linkJiri Pirko2014-09-091-7/+8