Merge tag 'batadv-net-for-davem-20190201' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2019 18:19:26 +0000 (10:19 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 1 Feb 2019 18:19:26 +0000 (10:19 -0800)
commit34dbba5d2dafc8ec0f9d70a0d9ac5c4504f27ccd
treeb9ff3d6ba07428524f50eb4519d570119fd8fc98
parent84826ac7337ed9af8a57c6445773d63d2fbe2fbc
parent7d652669b61d702c6e62a39579d17f6881670ab6
Merge tag 'batadv-net-for-davem-20190201' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

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

 - Avoid WARN to report incorrect configuration, by Sven Eckelmann

 - Fix mac header position setting, by Sven Eckelmann

 - Fix releasing station statistics, by Felix Fietkau
====================

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