Merge tag 'batadv-net-for-davem-20170316' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 16 Mar 2017 19:05:38 +0000 (12:05 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 16 Mar 2017 19:05:38 +0000 (12:05 -0700)
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>
1  2 
net/batman-adv/bat_iv_ogm.c
net/batman-adv/bat_v.c
net/batman-adv/fragmentation.c
net/batman-adv/gateway_common.c
net/batman-adv/soft-interface.c
net/batman-adv/types.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge