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

Simon Wunderlich says:

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

 - Keep fragments equally sized, avoids some problems with too small fragments,
   by Sven Eckelmann

 - Initialize gateway class correctly when BATMAN V is compiled in,
   by Sven Eckelmann
====================

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

diff --cc net/batman-adv/bat_iv_ogm.c
Simple merge

diff --cc net/batman-adv/bat_v.c
Simple merge

diff --cc net/batman-adv/fragmentation.c
Simple merge

diff --cc net/batman-adv/gateway_common.c
Simple merge

diff --cc net/batman-adv/soft-interface.c
Simple merge

diff --cc net/batman-adv/types.h
Simple merge