From: David S. Miller <davem@davemloft.net>
Date: Sat, 17 Nov 2018 04:26:30 +0000 (-0800)
Subject: Merge tag 'batadv-net-for-davem-20181114' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v4.20-rc4~25^2~12
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5594923f6e708d393c906e38399b3d4a65d390e9;p=linux.git

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>
---

5594923f6e708d393c906e38399b3d4a65d390e9