Merge tag 'batadv-next-for-davem-20170406' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 6 Apr 2017 21:37:50 +0000 (14:37 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 6 Apr 2017 21:37:50 +0000 (14:37 -0700)
commitbd414860440eebc8a7eb54be94c97e6ed09bb402
treee059b250b46a8e8cbcb54eff50d6d10ffd68baa7
parent54280168f3d9870e0d2b169b991189a09fc870b2
parentab044f8e3eaf84c4cc95d7606fadfdfa006dc8ec
Merge tag 'batadv-next-for-davem-20170406' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
This feature/cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - Code and Style cleanups, by Sven Eckelmann (5 patches)

 - Remove an unneccessary memset, by Tobias Klauser

 - DAT and BLA optimizations for various corner cases, by Andreas Pape
   (5 patches)

 - forward/rebroadcast packet restructuring, by Linus Luessing
   (2 patches)

 - ethtool cleanup and remove unncessary code, by Sven Eckelmann
   (4 patches)

 - use net_device_stats from net_device instead of private copy,
   by Tobias Klauser
====================

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