From patchwork Mon Jul 13 21:23:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 29752 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 374D2B7089 for ; Tue, 14 Jul 2009 07:34:55 +1000 (EST) Received: by ozlabs.org (Postfix) id 28C7DDDDE6; Tue, 14 Jul 2009 07:34:55 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id BA3D3DDDE5 for ; Tue, 14 Jul 2009 07:34:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932082AbZGMVdg (ORCPT ); Mon, 13 Jul 2009 17:33:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757506AbZGMVdJ (ORCPT ); Mon, 13 Jul 2009 17:33:09 -0400 Received: from server1.wserver.cz ([82.113.45.157]:52904 "EHLO server1.wserver.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757463AbZGMVdH (ORCPT ); Mon, 13 Jul 2009 17:33:07 -0400 Received: from localhost.localdomain (unknown [82.113.46.245]) by server1.wserver.cz (Postfix) with ESMTP id A9317C478F; Mon, 13 Jul 2009 23:29:38 +0200 (CEST) From: Jiri Slaby To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH 2/2] NET: sungem, use spin_trylock_irqsave Date: Mon, 13 Jul 2009 23:23:40 +0200 Message-Id: <1247520220-31960-2-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.3.2 In-Reply-To: <1247520220-31960-1-git-send-email-jirislaby@gmail.com> References: <1247520220-31960-1-git-send-email-jirislaby@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use spin_trylock_irqsave instead of open-coded local_irq_save+spin_trylock. Impact: cleanup Signed-off-by: Jiri Slaby --- drivers/net/sungem.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index d2dfe0a..22474a8 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -1032,10 +1032,8 @@ static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev) (csum_stuff_off << 21)); } - local_irq_save(flags); - if (!spin_trylock(&gp->tx_lock)) { + if (!spin_trylock_irqsave(&gp->tx_lock)) { /* Tell upper layer to requeue */ - local_irq_restore(flags); return NETDEV_TX_LOCKED; } /* We raced with gem_do_stop() */