projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dfa0d55 d7d8bbb)
Merge tag 'batadv-net-for-davem-20181114' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sat, 17 Nov 2018 04:26:30 +0000 (20:26 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 17 Nov 2018 04:26:30 +0000 (20:26 -0800)
commit5594923f6e708d393c906e38399b3d4a65d390e9
tree185e10cb675041c528f4f7b641032f7059fb2d6etree | snapshot
parentdfa0d55ff6be64e7b6881212a291cb95f8da3b08commit | diff
parentd7d8bbb40a5b1f682ee6589e212934f4c6b8ad60commit | diff
Merge tag 'batadv-net-for-davem-20181114' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

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

 - Explicitly pad short ELP packets with zeros, by Sven Eckelmann

 - Fix packet size calculation when merging fragments,
   by Sven Eckelmann
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
John Crispins staging tree