Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit e9eeb9371a60708f9650e473f7dc1a2b518baaee Merge: 56fd0ba a8c7689 Author: Marek Lindner mareklindner@neomailbox.ch Date: Fri Jul 10 16:15:01 2015 +0800

Merge branch 'next'

Conflicts: net/batman-adv/gateway_client.c

e9eeb9371a60708f9650e473f7dc1a2b518baaee net/batman-adv/gateway_client.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)

diff --cc net/batman-adv/gateway_client.c index ef78c41,6012e2b..d7ca214 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@@ -153,16 -153,11 +153,12 @@@ batadv_gw_get_best_gw_node(struct batad struct batadv_neigh_node *router; struct batadv_neigh_ifinfo *router_ifinfo; struct batadv_gw_node *gw_node, *curr_gw = NULL; - uint64_t max_gw_factor = 0, tmp_gw_factor = 0; - uint8_t max_tq = 0; - uint8_t tq_avg; + u64 max_gw_factor = 0; + u64 tmp_gw_factor = 0; - u32 gw_divisor; + u8 max_tq = 0; + u8 tq_avg; struct batadv_orig_node *orig_node;

- gw_divisor = BATADV_TQ_LOCAL_WINDOW_SIZE * BATADV_TQ_LOCAL_WINDOW_SIZE; - gw_divisor *= 64; - rcu_read_lock(); hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.list, list) { if (gw_node->deleted)