Merge tag 'batadv-next-for-davem-20161108-v2' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 10 Nov 2016 03:15:28 +0000 (22:15 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Nov 2016 03:15:28 +0000 (22:15 -0500)
commitd401c1d1e824f8238c4da5f432151fad0945aeab
treea7b58647e4497ebe39c7d7e7887e247defd89bf2
parenta6dfdb4e1cd8ea0cf3e8588b97a0c33f8ad3fa4b
parent93bbaab455f30fd43911e0881a02107a17150a62
Merge tag 'batadv-next-for-davem-20161108-v2' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
pull request for net-next: batman-adv 2016-11-08 v2

This feature and cleanup patchset includes the following changes:

 - netlink and code cleanups by Sven Eckelmann (3 patches)

 - Cleanup and minor fixes by Linus Luessing (3 patches)

 - Speed up multicast update intervals, by Linus Luessing

 - Avoid (re)broadcast in meshes for some easy cases,
   by Linus Luessing

 - Clean up tx return state handling, by Sven Eckelmann (6 patches)

 - Fix some special mac address handling cases, by Sven Eckelmann
   (3 patches)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/batman-adv/hard-interface.c
net/batman-adv/originator.c