Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 1 Jul 2016 21:05:00 +0000 (17:05 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Jul 2016 21:05:00 +0000 (17:05 -0400)
commit3ea00443f1b17405ce9e1421bb7706777339926e
treebc2708a8e693cc19ca8a6501c4307a3f62055d99
parentca9354a1d47d8e30dee114fc946fd71f1d403ca7
parent4e3e823b5a503235630921287f130e1d8d22d200
Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

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

 - two patches with minimal clean up work by Antonio Quartulli and
   Simon Wunderlich

 - eight patches of B.A.T.M.A.N. V, API and documentation clean
   up work, by Antonio Quartulli and Marek Lindner

 - Andrew Lunn fixed the skb priority adoption when forwarding
   fragmented packets (two patches)

 - Multicast optimization support is now enabled for bridges which
   comes with some protocol updates, by Linus Luessing
====================

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