[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <55CA4F1A.1050606@cogentembedded.com>
Date: Tue, 11 Aug 2015 22:38:02 +0300
From: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
To: Antonio Quartulli <antonio@...hcoding.com>, davem@...emloft.net
Cc: netdev@...r.kernel.org, b.a.t.m.a.n@...ts.open-mesh.org,
Linus Lüssing <linus.luessing@...3.blue>,
Marek Lindner <mareklindner@...mailbox.ch>
Subject: Re: [PATCH 04/10] batman-adv: Make NC capability changes atomic
On 08/11/2015 07:35 PM, Antonio Quartulli wrote:
> From: Linus Lüssing <linus.luessing@...3.blue>
>
> 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()/test_bit() functions.
>
> Fixes: 3f4841ffb336 ("batman-adv: tvlv - add network coding container")
> Signed-off-by: Linus Lüssing <linus.luessing@...3.blue>
> Signed-off-by: Marek Lindner <mareklindner@...mailbox.ch>
> Signed-off-by: Antonio Quartulli <antonio@...hcoding.com>
> ---
> net/batman-adv/network-coding.c | 7 ++++---
> net/batman-adv/types.h | 2 +-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/net/batman-adv/network-coding.c b/net/batman-adv/network-coding.c
> index f0a50f3..cfdc80d 100644
> --- a/net/batman-adv/network-coding.c
> +++ b/net/batman-adv/network-coding.c
[...]
> @@ -894,7 +895,7 @@ void batadv_nc_update_nc_node(struct batadv_priv *bat_priv,
> goto out;
>
> /* check if orig node is network coding enabled */
> - if (!(orig_node->capabilities & BATADV_ORIG_CAPA_HAS_NC))
> + if (!(test_bit(BATADV_ORIG_CAPA_HAS_NC, &orig_node->capabilities)))
Likewise, () around the call no needed.
[...]
MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists