From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ralf Baechle Subject: [PATCH v2 5/7] NET: ROSE: Make rose_neigh_no atomic. Date: Wed, 20 Jul 2011 19:09:15 +0100 Message-ID: <20110720180915.GA18223@linux-mips.org> References: Mime-Version: 1.0 Return-path: Content-Disposition: inline In-Reply-To: Sender: linux-hams-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-hams@vger.kernel.org Cc: Bernard F6BVP Signed-off-by: Ralf Baechle --- This patch fixes the build error introduced by the first patch. net/rose/rose_route.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index db6b96d..18e7d00 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c @@ -38,7 +38,7 @@ #include #include -static unsigned int rose_neigh_no = 1; +static atomic_t rose_neigh_no = ATOMIC_INIT(0); static struct rose_node *rose_node_list; static DEFINE_SPINLOCK(rose_node_list_lock); @@ -101,7 +101,7 @@ static int __must_check rose_add_node(struct rose_route_struct *rose_route, atomic_set(&rose_neigh->use, 0); rose_neigh->dce_mode = 0; rose_neigh->loopback = 0; - rose_neigh->number = rose_neigh_no++; + rose_neigh->number = atomic_inc_return(&rose_neigh_no); rose_neigh->restarted = 0; skb_queue_head_init(&rose_neigh->queue); @@ -388,7 +388,7 @@ void rose_add_loopback_neigh(void) atomic_set(&sn->use, 0); sn->dce_mode = 1; sn->loopback = 1; - sn->number = rose_neigh_no++; + sn->number = atomic_inc_return(&rose_neigh_no); sn->restarted = 1; skb_queue_head_init(&sn->queue);