Merge tag 'batadv-next-for-davem-20160704' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Jul 2016 06:33:59 +0000 (23:33 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Jul 2016 06:33:59 +0000 (23:33 -0700)
commitb77af26a790a2ecfdd4109a3b1328499ea988181
tree6e192798c8d05bfc04d27aa94dc51a6407801c63
parent5ee389751922a497d38c4750c5cbe6223873c24c
parent29824a55c07cd79a530d4bc1020a529c402515b6
Merge tag 'batadv-next-for-davem-20160704' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
This feature patchset includes the following changes:

 - Cleanup work by Markus Pargmann and Sven Eckelmann (six patches)

 - Initial Netlink support by Matthias Schiffer (two patches)

 - Throughput Meter implementation by Antonio Quartulli, a kernel-space
   traffic generator to estimate link speeds. This feature is useful on
   low-end WiFi APs where running iperf or netperf from userspace
   gives wrong results due to heavy userspace/kernelspace overhead.
   (two patches)

 - API clean-up work by Antonio Quartulli (one patch)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS
net/batman-adv/routing.c
net/batman-adv/soft-interface.c
net/batman-adv/translation-table.c
net/batman-adv/types.h