1
0
Fork 0
alistair23-linux/net/hsr
David S. Miller 27058af401 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-10-30 12:42:58 -04:00
..
Kconfig net/hsr: Added support for HSR v1 2016-04-15 17:06:48 -04:00
Makefile net/hsr: Better frame dispatch 2014-07-08 11:35:31 -07:00
hsr_device.c net: use core MTU range checking in misc drivers 2016-10-20 14:51:10 -04:00
hsr_device.h net/hsr: Added support for HSR v1 2016-04-15 17:06:48 -04:00
hsr_forward.c net/hsr: Remove unused but set variable 2016-10-18 10:28:18 -04:00
hsr_forward.h net/hsr: Better frame dispatch 2014-07-08 11:35:31 -07:00
hsr_framereg.c net/hsr: Added support for HSR v1 2016-04-15 17:06:48 -04:00
hsr_framereg.h net/hsr: Better frame dispatch 2014-07-08 11:35:31 -07:00
hsr_main.c net/hsr: Fix NULL pointer dereference and refcnt bugs when deleting a HSR interface. 2015-03-01 13:40:23 -05:00
hsr_main.h net/hsr: Added support for HSR v1 2016-04-15 17:06:48 -04:00
hsr_netlink.c genetlink: mark families as __ro_after_init 2016-10-27 16:16:09 -04:00
hsr_netlink.h net/hsr: Use list_head (and rcu) instead of array for slave devices. 2014-07-08 11:35:31 -07:00
hsr_slave.c net/hsr: Added support for HSR v1 2016-04-15 17:06:48 -04:00
hsr_slave.h net/hsr: Better frame dispatch 2014-07-08 11:35:31 -07:00