diff --git a/[refs] b/[refs] index d6c058ed7eca..91364b0dc516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0275e243c65be76a5e1352c58c8a4aeeb3854c6 +refs/heads/master: 9338026107166b54d54ef875978c9c3dca3aaee5 diff --git a/trunk/net/batman-adv/types.h b/trunk/net/batman-adv/types.h index 030ce412227e..441880a0caa7 100644 --- a/trunk/net/batman-adv/types.h +++ b/trunk/net/batman-adv/types.h @@ -119,7 +119,6 @@ struct batadv_orig_node { spinlock_t ogm_cnt_lock; /* bcast_seqno_lock protects bcast_bits, last_bcast_seqno */ spinlock_t bcast_seqno_lock; - spinlock_t tt_list_lock; /* protects tt_list */ atomic_t bond_candidates; struct list_head bond_list; };