From patchwork Thu Nov 24 10:46:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Machek X-Patchwork-Id: 698811 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 3tPbVN08b5z9t0G for ; Thu, 24 Nov 2016 21:46:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938732AbcKXKqY (ORCPT ); Thu, 24 Nov 2016 05:46:24 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:47802 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936026AbcKXKqW (ORCPT ); Thu, 24 Nov 2016 05:46:22 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 2AA6A824A5; Thu, 24 Nov 2016 11:46:20 +0100 (CET) Date: Thu, 24 Nov 2016 11:46:19 +0100 From: Pavel Machek To: peppe.cavallaro@st.com, netdev@vger.kernel.org, kernel list , ezequiel@vanguardiasur.com.ar, sonic.zhang@analog.com, fabrice.gasnier@st.com Subject: [PATCH] stmmac ethernet: unify locking Message-ID: <20161124104619.GA30723@amd> References: <20161123105125.GA26394@amd> <20161124085506.GA25007@amd> <20161124102901.GA27793@amd> <20161124103630.GB27793@amd> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161124103630.GB27793@amd> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make locking match in both _xmit functions. Signed-off-by: Pavel Machek diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 0363db3..1cff258 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2185,12 +2185,12 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) spin_lock(&priv->tx_lock); if (unlikely(stmmac_tx_avail(priv) < nfrags + 1)) { - spin_unlock(&priv->tx_lock); if (!netif_queue_stopped(dev)) { netif_stop_queue(dev); /* This is a hard error, log it. */ pr_err("%s: Tx Ring full when queue awake\n", __func__); } + spin_unlock(&priv->tx_lock); return NETDEV_TX_BUSY; }