From patchwork Wed May 22 02:01:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Ott X-Patchwork-Id: 245480 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 68E102C00A3 for ; Wed, 22 May 2013 12:02:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754841Ab3EVCBr (ORCPT ); Tue, 21 May 2013 22:01:47 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:39956 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754183Ab3EVCB0 (ORCPT ); Tue, 21 May 2013 22:01:26 -0400 Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 9641920C39; Tue, 21 May 2013 22:01:25 -0400 (EDT) Received: from frontend1.nyi.mail.srv.osa ([10.202.2.160]) by compute2.internal (MEProxy); Tue, 21 May 2013 22:01:25 -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=AJ6rk6egCB/TQcFSUMOpVoL8iUM=; b=lnzHM2Ctl0fzC2clQQNIo v3+urmvgL+VrokJ8gRwh7zqipucr4zi0Hwvkd98+evUecoqzowBOX6ggzt6XHK7T Z8MceUSQqGhSVK8ZrC5q569n9aaHqFMdwgRFlzGOEzmUpVrzzNS8l5xl+FHcYv3N qsR5q78oLHuv3XfsGctXxQ= 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=AJ6rk6egCB/TQcFSUMOpVoL8i UM=; b=Mqcwi0ihBq6+zTPWejPnhikThQ63CLPb0jt+1ZyO8hzO1XLgs0WcrI4rt aPkzUHz8PJKVBdmlGdXaabAQLrlZZbGshUd86iZxVRr4PRJ2qrjXkpuzir6RD8Sh C26MfJNQscM++rX+owTa+SaaCB/eap3LmkVtNLdNzVPWXA1F20= X-Sasl-enc: VurbihbRlo6buhY/jlqlfQLnJaDaxHlvf2wBUPO2o5XA 1369188085 Received: from ato.hsd1.fl.comcast.net. (unknown [76.29.154.88]) by mail.messagingengine.com (Postfix) with ESMTPA id 0D661C80004; Tue, 21 May 2013 22:01:24 -0400 (EDT) From: Alan Ott To: david@hauweele.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-zigbee-devel@lists.sourceforge.net, Alan Ott Subject: [PATCH beta 1] 1/3] mrf24j40: Move INIT_COMPLETION() to before packet transmission Date: Tue, 21 May 2013 22:01:18 -0400 Message-Id: <1369188080-8904-2-git-send-email-alan@signal11.us> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1369188080-8904-1-git-send-email-alan@signal11.us> References: <1369188080-8904-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 556151d..0ea2a5a 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -345,6 +345,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) @@ -355,8 +357,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,