summaryrefslogtreecommitdiffstats
path: root/net/bridge
Commit message (Expand)AuthorAgeFilesLines
* bridge: Remove unnecessary vlan_put_tag in br_handle_vlanToshiaki Makita2014-01-221-21/+0
* bridge: move br_net_exit() to br.cWANG Cong2014-01-133-19/+18
* netfilter: nf_tables: rename nft_do_chain_pktinfo() to nft_do_chain()Patrick McHardy2014-01-091-1/+1
* netfilter: nf_tables: minor nf_chain_type cleanupsPatrick McHardy2014-01-091-2/+2
* netfilter: nf_tables: constify chain type definitions and pointersPatrick McHardy2014-01-091-1/+1
* netfilter: nf_tables: add missing module references to chain typesPatrick McHardy2014-01-091-0/+1
* netfilter: nf_tables: add support for multi family tablesPatrick McHardy2014-01-071-0/+1
* netfilter: nf_tables: make chain types override the default AF functionsPatrick McHardy2014-01-071-19/+19
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-01-061-2/+2
|\
| * bridge: use spin_lock_bh() in br_multicast_set_hash_maxCurt Brune2014-01-061-2/+2
* | bridge: use DEVICE_ATTR_xx macrossfeldma@cumulusnetworks.com2014-01-061-141/+108
* | net: unify the pcpu_tstats and br_cpu_netstats as oneLi RongQing2014-01-043-15/+7
* | netlink: cleanup rntl_af_registerstephen hemminger2014-01-011-4/+1
* | bridge: change the position of '{' to the pre linetanxiaojun2013-12-194-18/+9
* | bridge: change "foo* bar" to "foo *bar"tanxiaojun2013-12-192-10/+10
* | bridge: add space before '(/{', after ',', etc.tanxiaojun2013-12-197-12/+12
* | bridge: remove unnecessary parenthesestanxiaojun2013-12-192-3/+3
* | bridge: remove unnecessary condition judgmenttanxiaojun2013-12-192-4/+2
* | bridge: spelling fixestanxiaojun2013-12-183-3/+3
* | net: more spelling fixesstephen hemminger2013-12-101-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-12-092-1/+11
|\|
| * br: fix use of ->rx_handler_data in code executed on non-rx_handler pathJiri Pirko2013-12-062-1/+11
* | netfilter: Fix FSF address in file headersJeff Kirsher2013-12-061-2/+1
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2013-11-211-3/+5
|\
| * netfilter: ebt_ip6: fix source and destination matchingLuís Fernando Cornachioni Estrozi2013-11-191-3/+5
* | bridge: flush br's address entry in fdb when remove theDing Tianhong2013-11-201-0/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-11-192-14/+11
|\ \
| * | bridge: Fix memory leak when deleting bridge with vlan filtering enabledToshiaki Makita2013-11-141-0/+1
| * | bridge: Call vlan_vid_del for all vids at nbp_vlan_flushToshiaki Makita2013-11-141-0/+4
| * | bridge: Use vlan_vid_[add/del] instead of direct ndo_vlan_rx_[add/kill]_vid c...Toshiaki Makita2013-11-141-14/+6
| |/
* | 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-042-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-041-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/+27
|\ \ \ \
| * | | | bridge: pass correct vlan id to multicast codeVlad Yasevich2013-10-294-29/+25
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2013-10-231-6/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | netfilter: ebt_ulog: fix info leaksMathias Krause2013-10-021-6/+3
* | | | | 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/+1
| * | | | 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/+49
| * | | | 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-192-173/+150
| |_|/ |/| |