Merge tag 'batadv-net-for-davem-20170613' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Jun 2017 17:46:01 +0000 (13:46 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Jun 2017 17:46:01 +0000 (13:46 -0400)
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>

Trivial merge