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)
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>
1  2 
net/batman-adv/fragmentation.c

Simple merge