summaryrefslogtreecommitdiffstats
path: root/net/bridge
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2015-06-2516-486/+531
|\
| * bridge: vlan: flush the dynamically learned entries on port vlan deleteNikolay Aleksandrov2015-06-246-7/+11
| * bridge: multicast: add a comment to br_port_state_selection about blocking stateNikolay Aleksandrov2015-06-241-0/+4
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-06-243-3/+7
| |\
| | * bridge: multicast: restore router configuration on port link down/upSatish Ashok2015-06-231-0/+4
| | * bridge: fix br_stp_set_bridge_priority race conditionsNikolay Aleksandrov2015-06-182-3/+3
| * | switchdev: rename vlan vid_start to vid_beginScott Feldman2015-06-231-2/+2
| * | bridge: multicast: start querier timer when running user-space stpNikolay Aleksandrov2015-06-231-1/+2
| * | netfilter: bridge: split ipv6 code into separated filePablo Neira Ayuso2015-06-183-239/+255
| * | netfilter: bridge: rename br_netfilter.c to br_netfilter_hooks.cPablo Neira Ayuso2015-06-182-0/+1
| * | bridge: del external_learned fdbs from device on flush or ageoutScott Feldman2015-06-161-0/+17
| * | bridge: use either ndo VLAN ops or switchdev VLAN ops to install MASTER vlansScott Feldman2015-06-161-2/+57
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-06-152-147/+258
| |\ \
| | * | netfilter: bridge: restore vlan tag when refragmentingFlorian Westphal2015-06-121-0/+10
| | * | net: ip_fragment: remove BRIDGE_NETFILTER mtu special handlingFlorian Westphal2015-06-121-0/+7
| | * | netfilter: bridge: forward IPv6 fragmented packetsBernhard Thaler2015-06-122-41/+104
| | * | netfilter: bridge: re-order check_hbh_len()Bernhard Thaler2015-06-121-55/+56
| | * | netfilter: bridge: rename br_parse_ip_optionsBernhard Thaler2015-06-121-5/+4Star
| | * | netfilter: bridge: refactor frag_max_sizeBernhard Thaler2015-06-122-14/+7Star
| | * | netfilter: bridge: detect NAT66 correctly and change MAC addressBernhard Thaler2015-06-121-9/+46
| | * | netfilter: bridge: re-order br_nf_pre_routing_finish_ipv6()Bernhard Thaler2015-06-121-31/+32
| | * | netfilter: bridge: refactor clearing BRNF_NF_BRIDGE_PREROUTINGBernhard Thaler2015-06-121-2/+2
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-06-141-4/+3Star
| |\ \ \ | | |/ / | |/| / | | |/
| * | bridge: make br_fdb_delete also check if the port matchesNikolay Aleksandrov2015-06-111-3/+5
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-06-091-0/+2
| |\ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-06-022-5/+1Star
| |\ \ \
| * | | | bridge: skip fdb add if the port shouldn't learnWilson Kok2015-05-261-0/+6
| * | | | bridge: allow setting hash_max + multicast_router if interface is downLinus Lüssing2015-05-251-21/+3Star
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-05-234-19/+16Star
| |\ \ \ \
| * | | | | bridge_netfilter: No ICMP packet on IPv4 fragmentation errorAndy Zhou2015-05-191-1/+20
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-05-182-4/+21
| |\ \ \ \ \
| | * | | | | netfilter: x_tables: add context to know if extension runs from nft_compatPablo Neira Ayuso2015-05-151-2/+4
| | * | | | | netfilter: bridge: free nf_bridge info on xmitFlorian Westphal2015-05-141-2/+15
| | * | | | | netfilter: bridge: neigh_head and physoutdev can't be used at same timeFlorian Westphal2015-05-141-0/+2
| * | | | | | switchdev: don't use anonymous union on switchdev attr/obj structsScott Feldman2015-05-131-1/+1
| |/ / / / /
| * | | | | bridge: revert br_dellink change back to originalScott Feldman2015-05-131-10/+1Star
| * | | | | bridge: restore br_setlink back to originalScott Feldman2015-05-131-10/+1Star
| * | | | | switchdev: convert STP update to switchdev attr setScott Feldman2015-05-131-1/+5
| * | | | | switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/Jiri Pirko2015-05-133-16/+14Star
| * | | | | ebtables: Use eth_proto_is_802_3Alexander Duyck2015-05-061-1/+1
| * | | | | bridge: change BR_GROUPFWD_RESTRICTED to allow forwarding of LLDP framesBernhard Thaler2015-05-061-2/+2
| * | | | | net: Export IGMP/MLD message validation codeLinus Lüssing2015-05-041-188/+30Star
| * | | | | bridge: multicast: call skb_checksum_{simple_, }validateLinus Lüssing2015-05-041-24/+4Star
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2015-06-231-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | netfilter: ebtables: fix comment grammarGeert Uytterhoeven2015-05-261-1/+1
* | | | | | bridge: fix multicast router rlist endless loopNikolay Aleksandrov2015-06-111-4/+3Star
| |_|_|_|/ |/| | | |
* | | | | bridge: disable softirqs around br_fdb_update to avoid lockupNikolay Aleksandrov2015-06-081-0/+2
* | | | | Revert "bridge: use _bh spinlock variant for br_fdb_update to avoid lockup"David S. Miller2015-06-081-2/+2
* | | | | bridge: use _bh spinlock variant for br_fdb_update to avoid lockupWilson Kok2015-06-081-2/+2
| |_|_|/ |/| | |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-06-021-4/+0Star
|\ \ \ \