linux-hardened/net/batman-adv
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
..
bat_algo.c batman-adv: Allow to disable debugfs support 2016-08-09 07:54:54 +02:00
bat_algo.h batman-adv: netlink: add routing_algo query 2016-08-09 07:54:36 +02:00
bat_iv_ogm.c batman-adv: Use proper name for gateway list head 2016-10-19 08:37:53 +02:00
bat_iv_ogm.h batman-adv: Fix bat_(iv|v) function declaration header 2016-06-30 10:29:43 +02:00
bat_v.c batman-adv: Use proper name for gateway list head 2016-10-19 08:37:53 +02:00
bat_v.h batman-adv: Fix bat_(iv|v) function declaration header 2016-06-30 10:29:43 +02:00
bat_v_elp.c batman-adv: fix elp packet data reservation 2016-08-26 15:22:31 +02:00
bat_v_elp.h batman-adv: Keep includes ordered by filename 2016-06-30 10:29:43 +02:00
bat_v_ogm.c batman-adv: Remove needless init of variables on stack 2016-10-19 08:37:52 +02:00
bat_v_ogm.h batman-adv: Include main.h in bat_v_ogm.h 2016-06-30 10:29:43 +02:00
bitarray.c batman-adv: Consolidate logging related functions 2016-06-30 10:29:43 +02:00
bitarray.h batman-adv: Use bool as return type for boolean functions 2016-05-10 18:28:54 +08:00
bridge_loop_avoidance.c batman-adv: Allow to disable debugfs support 2016-08-09 07:54:54 +02:00
bridge_loop_avoidance.h batman-adv: add backbone table netlink support 2016-08-09 07:54:43 +02:00
debugfs.c batman-adv: Use octal permissions instead of macros 2016-10-19 08:37:53 +02:00
debugfs.h treewide: remove redundant #include <linux/kconfig.h> 2016-10-11 15:06:33 -07:00
distributed-arp-table.c batman-adv: remove unsed argument from batadv_dbg_arp() function 2016-10-17 16:28:47 +02:00
distributed-arp-table.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
fragmentation.c batman-adv: Use proper name for fragments list head 2016-10-19 08:37:52 +02:00
fragmentation.h batman-adv: Use proper name for fragments list head 2016-10-19 08:37:52 +02:00
gateway_client.c batman-adv: Use proper name for gateway list head 2016-10-19 08:37:53 +02:00
gateway_client.h batman-adv: netlink: add gateway table queries 2016-08-09 07:54:40 +02:00
gateway_common.c batman-adv: make GW election code protocol specific 2016-08-09 07:54:29 +02:00
gateway_common.h batman-adv: add throughput override attribute to hard_ifaces 2016-02-29 16:05:32 +08:00
hard-interface.c batman-adv: fix splat on disabling an interface 2016-10-21 14:47:02 +02:00
hard-interface.h batman-adv: Create batman soft interfaces within correct netns. 2016-05-10 18:26:44 +08:00
hash.c batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
hash.h batman-adv: Remove unused function batadv_hash_delete 2016-10-17 16:28:45 +02:00
icmp_socket.c batman-adv: Use octal permissions instead of macros 2016-10-19 08:37:53 +02:00
icmp_socket.h batman-adv: Allow to disable debugfs support 2016-08-09 07:54:54 +02:00
Kconfig batman-adv: Allow selecting BATMAN V if CFG80211 is not built 2016-10-17 16:28:48 +02:00
log.c batman-adv: Use octal permissions instead of macros 2016-10-19 08:37:53 +02:00
log.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-30 12:42:58 -04:00
main.c batman-adv: Use proper name for gateway list head 2016-10-19 08:37:53 +02:00
main.h batman-adv: Avoid precedence issues in macros 2016-10-19 08:37:54 +02:00
Makefile batman-adv: Allow to disable debugfs support 2016-08-09 07:54:54 +02:00
multicast.c batman-adv: Allow to disable debugfs support 2016-08-09 07:54:54 +02:00
multicast.h batman-adv: Add debugfs table for mcast flags 2016-06-30 10:29:43 +02:00
netlink.c genetlink: mark families as __ro_after_init 2016-10-27 16:16:09 -04:00
netlink.h batman-adv: netlink: add translation table query 2016-08-09 07:54:37 +02:00
network-coding.c batman-adv: Use octal permissions instead of macros 2016-10-19 08:37:53 +02:00
network-coding.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
originator.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-10-30 12:42:58 -04:00
originator.h batman-adv: netlink: add originator and neighbor table queries 2016-08-09 07:54:38 +02:00
packet.h batman-adv: Avoid precedence issues in macros 2016-10-19 08:37:54 +02:00
routing.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-09-23 06:46:57 -04:00
routing.h batman-adv: Use bool as return type for boolean functions 2016-05-10 18:28:54 +08:00
send.c batman-adv: Remove needless init of variables on stack 2016-10-19 08:37:52 +02:00
send.h batman-adv: Introduce forward packet creation helper 2016-08-09 07:54:32 +02:00
soft-interface.c batman-adv: Revert "use core MTU range checking in misc drivers" 2016-10-26 17:19:07 -04:00
soft-interface.h batman-adv: Use bool as return type for boolean functions 2016-05-10 18:28:54 +08:00
sysfs.c batman-adv: Use octal permissions instead of macros 2016-10-19 08:37:53 +02:00
sysfs.h batman-adv: update copyright years for 2016 2016-02-02 12:55:10 +08:00
tp_meter.c batman-adv: throughput meter implementation 2016-07-04 12:37:18 +02:00
tp_meter.h batman-adv: throughput meter implementation 2016-07-04 12:37:18 +02:00
translation-table.c batman-adv: Less function calls in batadv_is_ap_isolated() after error detection 2016-10-18 15:02:43 +02:00
translation-table.h batman-adv: netlink: add translation table query 2016-08-09 07:54:37 +02:00
tvlv.c batman-adv: Place kref_get for tvlv_handler near use 2016-08-09 07:54:53 +02:00
tvlv.h batman-adv: split tvlv into a separate file 2016-06-30 10:29:43 +02:00
types.h batman-adv: Use proper name for gateway list head 2016-10-19 08:37:53 +02:00