From: David S. Miller <davem@davemloft.net>
Date: Tue, 13 Jun 2017 17:46:01 +0000 (-0400)
Subject: Merge tag 'batadv-net-for-davem-20170613' of git://git.open-mesh.org/linux-merge
X-Git-Tag: v4.12-rc6~32^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7de84403a2020874714f6f40170f5ef9fc7ab58e;p=users%2Fhch%2Fmisc.git

Merge tag 'batadv-net-for-davem-20170613' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

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

 - fix rx packet counters for local ARP replies, by Sven Eckelmann

 - fix memory leaks for unicast packetes received from another gateway
   in bridge loop avoidance, by Andreas Pape
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

7de84403a2020874714f6f40170f5ef9fc7ab58e