61 lines
2.0 KiB
Diff
61 lines
2.0 KiB
Diff
From a51fa16ecf3f079518baaa56bffae343bd5694f0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Linus=20L=C3=BCssing?= <linus.luessing@c0d3.blue>
|
|
Date: Tue, 16 Jun 2015 17:10:24 +0200
|
|
Subject: [PATCH 05/17] batman-adv: Make TT capability changes atomic
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Bitwise OR/AND assignments in C aren't guaranteed to be atomic. One
|
|
OGM handler might undo the set/clear of a specific bit from another
|
|
handler run in between.
|
|
|
|
Fix this by using the atomic set_bit()/clear_bit() functions.
|
|
|
|
Fixes: 5d2121af6d31 ("batman-adv: introduce capability initialization bitfield")
|
|
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
|
|
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
|
|
---
|
|
translation-table.c | 4 ++--
|
|
types.h | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/translation-table.c b/translation-table.c
|
|
index b098e53..e95a424 100644
|
|
--- a/translation-table.c
|
|
+++ b/translation-table.c
|
|
@@ -1843,7 +1843,7 @@ void batadv_tt_global_del_orig(struct batadv_priv *bat_priv,
|
|
}
|
|
spin_unlock_bh(list_lock);
|
|
}
|
|
- orig_node->capa_initialized &= ~BATADV_ORIG_CAPA_HAS_TT;
|
|
+ clear_bit(BATADV_ORIG_CAPA_HAS_TT, &orig_node->capa_initialized);
|
|
}
|
|
|
|
static bool batadv_tt_global_to_purge(struct batadv_tt_global_entry *tt_global,
|
|
@@ -2802,7 +2802,7 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
|
|
return;
|
|
}
|
|
}
|
|
- orig_node->capa_initialized |= BATADV_ORIG_CAPA_HAS_TT;
|
|
+ set_bit(BATADV_ORIG_CAPA_HAS_TT, &orig_node->capa_initialized);
|
|
}
|
|
|
|
static void batadv_tt_fill_gtable(struct batadv_priv *bat_priv,
|
|
diff --git a/types.h b/types.h
|
|
index e33b5aa..c6ec558 100644
|
|
--- a/types.h
|
|
+++ b/types.h
|
|
@@ -257,7 +257,7 @@ struct batadv_orig_node {
|
|
struct hlist_node mcast_want_all_ipv6_node;
|
|
#endif
|
|
unsigned long capabilities;
|
|
- uint8_t capa_initialized;
|
|
+ unsigned long capa_initialized;
|
|
atomic_t last_ttvn;
|
|
unsigned char *tt_buff;
|
|
int16_t tt_buff_len;
|
|
--
|
|
2.1.4
|
|
|