summaryrefslogtreecommitdiffstats
path: root/net/bridge
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2013-11-141-0/+7
|\
| * net: Explicitly initialize u64_stats_sync structures for lockdepJohn Stultz2013-11-061-0/+7
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-11-052-2/+40
|\ \
| * | netfilter: bridge: nf_tables: add filter chain typePablo Neira Ayuso2013-10-281-2/+39
| * | netfilter: bridge: fix nf_tables bridge dependencies with main corePablo Neira Ayuso2013-10-281-0/+1
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2013-11-051-0/+2
|\ \ \
| * | | bridge: netfilter: orphan skb before invoking ip netfilter hooksFlorian Westphal2013-10-271-0/+2
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-11-045-35/+27Star
|\ \ \ \
| * | | | bridge: pass correct vlan id to multicast codeVlad Yasevich2013-10-294-29/+25Star
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2013-10-231-6/+3Star
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | netfilter: ebt_ulog: fix info leaksMathias Krause2013-10-021-6/+3Star
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-10-237-79/+99
|\| | | |
| * | | | Revert "bridge: only expire the mdb entry when query is received"Linus Lüssing2013-10-223-22/+28
| * | | | bridge: Fix updating FDB entries when the PVID is appliedToshiaki Makita2013-10-181-0/+1
| * | | | bridge: Fix the way the PVID is referencedToshiaki Makita2013-10-181-3/+1Star
| * | | | bridge: Apply the PVID to priority-tagged framesToshiaki Makita2013-10-181-7/+20
| * | | | bridge: Don't use VID 0 and 4095 in vlan filteringToshiaki Makita2013-10-183-54/+49Star
| * | | | bridge: Correctly clamp MAX forward_delay when enabling STPVlad Yasevich2013-10-171-1/+1
| * | | | bridge: update mdb expiration timer upon reports.Vlad Yasevich2013-10-111-1/+8
| |/ / /
* | | / net: 8021q/bluetooth/bridge/can/ceph: Remove extern from function prototypesJoe Perches2013-10-202-173/+150Star
| |_|/ |/| |
* | | netfilter: nf_tables: complete net namespace supportPablo Neira Ayuso2013-10-141-2/+30
* | | netfilter: add nftablesPatrick McHardy2013-10-143-0/+42
* | | netfilter: pass hook ops to hookfnPatrick McHardy2013-10-143-20/+34
| |/ |/|
* | net:drivers/net: Miscellaneous conversions to ETH_ALENJoe Perches2013-10-022-3/+3
|/
* bridge: fix NULL pointer deref of br_port_get_rcuHong Zhiguo2013-09-161-4/+1Star
* bridge: use br_port_get_rtnl within rtnl lockHong Zhiguo2013-09-162-3/+3
* bridge: Clamp forward_delay when enabling STPHerbert Xu2013-09-133-8/+26
* resubmit bridge: fix message_age_timer calculationChris Healy2013-09-131-1/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-09-056-35/+33Star
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-09-055-93/+240
| |\
| * | bridge: apply multicast snooping to IPv6 link-local, tooLinus Lüssing2013-09-053-14/+6Star
| * | bridge: prevent flooding IPv6 packets that do not have a listenerLinus Lüssing2013-09-051-2/+8
| * | net: ipv6: mld: get rid of MLDV2_MRC and simplify calculationDaniel Borkmann2013-09-041-1/+2
| * | bridge: inherit slave devices needed_headroomFlorian Fainelli2013-08-291-0/+3
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-08-263-9/+9
| |\ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-08-172-2/+2
| |\ \ \
| * | | | bridge: fix rcu check warning in multicast port groupstephen hemminger2013-08-052-2/+3
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-08-044-13/+49
| |\ \ \ \
| * | | | | bridge: cleanup netpoll codestephen hemminger2013-07-273-17/+8Star
| * | | | | net: convert resend IGMP to notifier eventJiri Pirko2013-07-241-0/+5
* | | | | | Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-09-053-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.Rusty Russell2013-07-153-3/+3
| |/ / / /
* | | | | net: bridge: convert MLDv2 Query MRC into msecs_to_jiffies for max_delayDaniel Borkmann2013-08-301-1/+2
* | | | | bridge: separate querier and query timer into IGMP/IPv4 and MLD/IPv6 onesLinus Lüssing2013-08-305-93/+240
| |_|_|/ |/| | |
* | | | bridge: Use the correct bit length for bitmap functions in the VLAN codeToshiaki Makita2013-08-213-9/+9
| |_|/ |/| |
* | | bridge: correct the comment for file br_sysfs_br.cWang Sheng-Hui2013-08-071-1/+1
* | | bridge: don't try to update timers in case of broken MLD queriesLinus Lüssing2013-08-061-1/+1
| |/ |/|
* | bridge: disable snooping if there is no querierLinus Lüssing2013-08-014-11/+46
* | bridge: do not call setup_timer() multiple timesEric Dumazet2013-07-201-2/+3
|/
* bridge: fix some kernel warning in multicast timerCong Wang2013-07-072-2/+2