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

On branch : next

commit efc1b3a90900749e03d17d8a14527b3758afd976 Merge: 3b1bf5a 6c9d9ee Author: Marek Lindner lindner_marek@yahoo.de Date: Sun Sep 23 23:15:15 2012 +0800

Merge branch 'maint' into next

Conflicts: bat_iv_ogm.c

efc1b3a90900749e03d17d8a14527b3758afd976 bat_iv_ogm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)

diff --cc bat_iv_ogm.c index df79300,469daab..b02b75d --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@@ -652,9 -642,9 +652,10 @@@ batadv_iv_ogm_orig_update(struct batadv struct batadv_neigh_node *router = NULL; struct batadv_orig_node *orig_node_tmp; struct hlist_node *node; + int if_num; uint8_t sum_orig, sum_neigh; uint8_t *neigh_addr; + uint8_t tq_avg;

batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "update_originator(): Searching and updating originator entry of received packet\n");