diff options
author | David S. Miller <davem@davemloft.net> | 2017-03-16 22:05:38 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-16 22:05:38 +0300 |
commit | b124f413323e90398b868a9848e63149d0fed8ce (patch) | |
tree | cefa770d1522702c92d94869fd51a22585357e9d /net/batman-adv/gateway_common.c | |
parent | 8f3dbfd79ed9ef9770305a7cc4e13dfd31ad2cd0 (diff) | |
parent | 1a9070ec91b37234fe915849b767c61584c64a44 (diff) | |
download | linux-b124f413323e90398b868a9848e63149d0fed8ce.tar.xz |
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>
Diffstat (limited to 'net/batman-adv/gateway_common.c')
-rw-r--r-- | net/batman-adv/gateway_common.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c index 5db2e43e3775..33940c5c74a8 100644 --- a/net/batman-adv/gateway_common.c +++ b/net/batman-adv/gateway_common.c @@ -253,6 +253,11 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv, */ void batadv_gw_init(struct batadv_priv *bat_priv) { + if (bat_priv->algo_ops->gw.init_sel_class) + bat_priv->algo_ops->gw.init_sel_class(bat_priv); + else + atomic_set(&bat_priv->gw.sel_class, 1); + batadv_tvlv_handler_register(bat_priv, batadv_gw_tvlv_ogm_handler_v1, NULL, BATADV_TVLV_GW, 1, BATADV_TVLV_HANDLER_OGM_CIFNOTFND); |