Merge tag 'batadv-net-for-davem-20170301' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 2 Mar 2017 21:16:08 +0000 (13:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 2 Mar 2017 21:16:08 +0000 (13:16 -0800)
commit6d517f2b993d8bd87f6d3a6be1f416f6fb31d5ab
treef3ce8a513c47f132de3009e49ec501ad3e95b15b
parentced5bfb7035cafc5b13c69dc0971d724d3e554ac
parent6dd4e48ef240f7f860fdaa885745704a1988d029
Merge tag 'batadv-net-for-davem-20170301' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
Here are two batman-adv bugfixes:

 - fix a potential double free when fragment merges fail,
   by Sven Eckelmann

 - fix failing tranmission of the 16th (last) fragment if that exists,
   by Linus Lüssing
====================

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