| commit | 5594923f6e708d393c906e38399b3d4a65d390e9 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Nov 16 20:26:30 2018 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Fri Nov 16 20:26:30 2018 -0800 |
| tree | 185e10cb675041c528f4f7b641032f7059fb2d6e | |
| parent | dfa0d55ff6be64e7b6881212a291cb95f8da3b08 [diff] | |
| parent | d7d8bbb40a5b1f682ee6589e212934f4c6b8ad60 [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>