Merge branch 'work.xattr' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / net / batman-adv / gateway_common.c

diff --git a/net/batman-adv/gateway_common.c b/net/batman-adv/gateway_common.c
index d7bc6a8..2118481 100644 (file)
--- a/net/batman-adv/gateway_common.c
+++ b/net/batman-adv/gateway_common.c
@@ -241,10 +241,9 @@ static void batadv_gw_tvlv_ogm_handler_v1(struct batadv_priv *bat_priv,
 
        batadv_gw_node_update(bat_priv, orig, &gateway);
 
-       /* restart gateway selection if fast or late switching was enabled */
+       /* restart gateway selection */
        if ((gateway.bandwidth_down != 0) &&
-           (atomic_read(&bat_priv->gw.mode) == BATADV_GW_MODE_CLIENT) &&
-           (atomic_read(&bat_priv->gw.sel_class) > 2))
+           (atomic_read(&bat_priv->gw.mode) == BATADV_GW_MODE_CLIENT))
                batadv_gw_check_election(bat_priv, orig);
 }