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

On branch : master

commit d7c9a9eaeb3370c372b6ef1d33b73f7bbca70cb7 Merge: d58a135 4030943 Author: Marek Lindner mareklindner@neomailbox.ch Date: Sun Feb 28 12:50:18 2016 +0800

Merge branch 'next'

d7c9a9eaeb3370c372b6ef1d33b73f7bbca70cb7 net/batman-adv/bat_iv_ogm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --cc net/batman-adv/bat_iv_ogm.c index 14ee1df,dadd52a..2c65668 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@@ -1182,10 -1145,10 +1182,11 @@@ static bool batadv_iv_ogm_calc_tq(struc u8 total_count; u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; unsigned int neigh_rq_inv_cube, neigh_rq_max_cube; - int tq_asym_penalty, inv_asym_penalty, if_num; - int if_num, ret = 0; ++ int if_num; + unsigned int tq_asym_penalty, inv_asym_penalty; unsigned int combined_tq; - int tq_iface_penalty; + unsigned int tq_iface_penalty; + bool ret = false;

/* find corresponding one hop neighbor */ rcu_read_lock();