From patchwork Sun Oct 6 03:52:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Ott X-Patchwork-Id: 280828 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2CC422C00AA for ; Sun, 6 Oct 2013 14:53:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753544Ab3JFDwu (ORCPT ); Sat, 5 Oct 2013 23:52:50 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:35493 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752914Ab3JFDwk (ORCPT ); Sat, 5 Oct 2013 23:52:40 -0400 Received: from compute4.internal (compute4.nyi.mail.srv.osa [10.202.2.44]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 1EB5521B15; Sat, 5 Oct 2013 23:52:40 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Sat, 05 Oct 2013 23:52:40 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=signal11.us; h= from:to:cc:subject:date:message-id:in-reply-to:references; s= mesmtp; bh=PA1vGg8GBm7M/p5hoiradD1RqMg=; b=JuFzdq4HwOH+mBBG6zJwg 4G/dNOLRWKJybwDBY7p7M9ayM8Bs3upunW2qnKwQaGs2hzjU5jj+lm6p6MM/dWoM 7zyYETByh+YW0x0AWEXkEg8lwGCSWONEnwQI1gIr2obWX4tDyhulTpjaikSPnTFG u8J2xh5Lm2N9jEAarWSvyA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references; s=smtpout; bh=PA1vGg8GBm7M/p5hoiradD1Rq Mg=; b=F2HAxKjjh0OpiXHc+lIGMdXolhxZpCufhWxa7LpvarHOeRhH6bAq6Mec1 3RjIL6GZFORpPoATZpeeyNqDhcXsUUDZBMyNOUwly7cER32/+jv8++ZL2oEKMnh6 0vzWsxv2C2r9zlBJOHOVg0jgqBeRnSzOAM1iEu+D/WRvCZDzW0= X-Sasl-enc: T/v0FXwaMwT8cyG8zvIaetVrCbiTL7AEwwbScYbagcCU 1381031559 Received: from ato.hsd1.fl.comcast.net (unknown [76.29.154.88]) by mail.messagingengine.com (Postfix) with ESMTPA id 3CA6EC00E83; Sat, 5 Oct 2013 23:52:39 -0400 (EDT) From: Alan Ott To: Alexander Smirnov , Dmitry Eremin-Solenikov , "David S. Miller" , david@hauweele.net Cc: linux-zigbee-devel@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alan Ott Subject: [PATCH v1 1/3] mrf24j40: Move INIT_COMPLETION() to before packet transmission Date: Sat, 5 Oct 2013 23:52:22 -0400 Message-Id: <1381031544-2960-2-git-send-email-alan@signal11.us> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381031544-2960-1-git-send-email-alan@signal11.us> References: <1369188080-8904-1-git-send-email-alan@signal11.us> <1381031544-2960-1-git-send-email-alan@signal11.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This avoids a race condition where complete(tx_complete) could be called before tx_complete is initialized. Signed-off-by: Alan Ott --- drivers/net/ieee802154/mrf24j40.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 42e6dee..66bb4ce 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -344,6 +344,8 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb) if (ret) goto err; + INIT_COMPLETION(devrec->tx_complete); + /* Set TXNTRIG bit of TXNCON to send packet */ ret = read_short_reg(devrec, REG_TXNCON, &val); if (ret) @@ -354,8 +356,6 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb) val |= 0x4; write_short_reg(devrec, REG_TXNCON, val); - INIT_COMPLETION(devrec->tx_complete); - /* Wait for the device to send the TX complete interrupt. */ ret = wait_for_completion_interruptible_timeout( &devrec->tx_complete,