From patchwork Wed Nov 4 16:06:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 37597 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 03099B7BB8 for ; Thu, 5 Nov 2009 03:07:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757042AbZKDQG4 (ORCPT ); Wed, 4 Nov 2009 11:06:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757037AbZKDQG4 (ORCPT ); Wed, 4 Nov 2009 11:06:56 -0500 Received: from server1.wserver.cz ([82.113.45.157]:59711 "EHLO server1.wserver.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757035AbZKDQGz (ORCPT ); Wed, 4 Nov 2009 11:06:55 -0500 Received: from localhost.localdomain (unknown [82.113.46.245]) by server1.wserver.cz (Postfix) with ESMTP id 53E8DC4D36; Wed, 4 Nov 2009 17:15:32 +0100 (CET) From: Jiri Slaby To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH 1/1] NET: sungem, use spin_trylock_irqsave Date: Wed, 4 Nov 2009 17:06:58 +0100 Message-Id: <1257350818-4194-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.4.2 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 7019a0d..51bde03 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c @@ -1034,10 +1034,8 @@ static netdev_tx_t gem_start_xmit(struct sk_buff *skb, (csum_stuff_off << 21)); } - local_irq_save(flags); - if (!spin_trylock(&gp->tx_lock)) { + if (!spin_trylock_irqsave(&gp->tx_lock, flags)) { /* Tell upper layer to requeue */ - local_irq_restore(flags); return NETDEV_TX_LOCKED; } /* We raced with gem_do_stop() */