diff options
| author | David S. Miller <davem@davemloft.net> | 2017-03-16 12:05:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-16 12:05:38 -0700 |
| commit | b124f413323e90398b868a9848e63149d0fed8ce (patch) | |
| tree | cefa770d1522702c92d94869fd51a22585357e9d /net/batman-adv/bat_iv_ogm.c | |
| parent | 8f3dbfd79ed9ef9770305a7cc4e13dfd31ad2cd0 (diff) | |
| parent | 1a9070ec91b37234fe915849b767c61584c64a44 (diff) | |
| download | linux-b124f413323e90398b868a9848e63149d0fed8ce.tar.gz linux-b124f413323e90398b868a9848e63149d0fed8ce.tar.bz2 linux-b124f413323e90398b868a9848e63149d0fed8ce.zip | |
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/bat_iv_ogm.c')
| -rw-r--r-- | net/batman-adv/bat_iv_ogm.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 7c3d994e90d8..71343d0fec94 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -2477,6 +2477,16 @@ static void batadv_iv_iface_activate(struct batadv_hard_iface *hard_iface) batadv_iv_ogm_schedule(hard_iface); } +/** + * batadv_iv_init_sel_class - initialize GW selection class + * @bat_priv: the bat priv with all the soft interface information + */ +static void batadv_iv_init_sel_class(struct batadv_priv *bat_priv) +{ + /* set default TQ difference threshold to 20 */ + atomic_set(&bat_priv->gw.sel_class, 20); +} + static struct batadv_gw_node * batadv_iv_gw_get_best_gw_node(struct batadv_priv *bat_priv) { @@ -2823,6 +2833,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { .del_if = batadv_iv_ogm_orig_del_if, }, .gw = { + .init_sel_class = batadv_iv_init_sel_class, .get_best_gw_node = batadv_iv_gw_get_best_gw_node, .is_eligible = batadv_iv_gw_is_eligible, #ifdef CONFIG_BATMAN_ADV_DEBUGFS |