On Wed, May 29, 2013 at 04:09:51PM +0200, Simon Wunderlich wrote: > > - if (!orig_node->bcast_own_sum) > > - goto free_bcast_own; > > + spin_lock_init(&orig_node->bcast_seqno_lock); > > + reset_time = jiffies - 1 - msecs_to_jiffies(BATADV_RESET_PROTECTION_MS); > > + orig_node->bcast_seqno_reset = reset_time; > > + orig_node->batman_seqno_reset = reset_time; > > Why are you moving this stuff around in the function? I don't see the purpose ... reset_time > or bcast_seqno_lock are just moved, but not changed. well, if you look some lines above you see the vlan stuff being allocated....hence this is a rebase error :) while merging this change with tt-vlan I introduced the error. [...] > > struct list_head vlan_list; > > spinlock_t vlan_list_lock; /* protects vlan_list */ > > + struct batadv_orig_bat_iv bat_iv; > > }; > > Same here: there are various fields which are just moved around for no obvious > reason (bcast_seqno_lock, batman_seqno_reset, bcast_seqno_reset, last_seen, last_ttl, > ...) yeah sorry. as before, probably an issue triggered by a rebase. Luckily this is just an rfc and not the final patchset :) Thanks! -- Antonio Quartulli ..each of us alone is worth nothing.. Ernesto "Che" Guevara