diff options
| author | Marek Lindner <lindner_marek@yahoo.de> | 2011-01-25 21:52:10 +0000 |
|---|---|---|
| committer | Marek Lindner <lindner_marek@yahoo.de> | 2011-03-05 12:50:08 +0100 |
| commit | 0ede9f41b217d8982ab426e3c8c1b692a280a16f (patch) | |
| tree | 3d3379f4614ec898d1db8845fdcbbbf7134f0165 /net/batman-adv/types.h | |
| parent | ed75ccbe26f4a672a41556120390e67c80a2c441 (diff) | |
| download | op-kernel-dev-0ede9f41b217d8982ab426e3c8c1b692a280a16f.zip op-kernel-dev-0ede9f41b217d8982ab426e3c8c1b692a280a16f.tar.gz | |
batman-adv: protect bit operations to count OGMs with spinlock
Reported-by: Linus Lüssing <linus.luessing@saxnet.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Diffstat (limited to 'net/batman-adv/types.h')
| -rw-r--r-- | net/batman-adv/types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index e0140c6..9a14276 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -70,8 +70,6 @@ struct orig_node { struct neigh_node *router; unsigned long *bcast_own; uint8_t *bcast_own_sum; - uint8_t tq_own; - int tq_asym_penalty; unsigned long last_valid; unsigned long bcast_seqno_reset; unsigned long batman_seqno_reset; @@ -89,7 +87,9 @@ struct orig_node { struct kref refcount; struct bat_priv *bat_priv; unsigned long last_frag_packet; - spinlock_t ogm_cnt_lock; /* protects ogm counter */ + spinlock_t ogm_cnt_lock; /* protects: bcast_own, bcast_own_sum, + * neigh_node->real_bits, + * neigh_node->real_packet_count */ atomic_t bond_candidates; struct list_head bond_list; }; |
