From patchwork Tue Oct 28 12:06:00 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Newton X-Patchwork-Id: 6087 X-Patchwork-Delegate: jgarzik@pobox.com 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 22BF4DDE9F for ; Tue, 28 Oct 2008 23:06:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752763AbYJ1MGH (ORCPT ); Tue, 28 Oct 2008 08:06:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752588AbYJ1MGH (ORCPT ); Tue, 28 Oct 2008 08:06:07 -0400 Received: from hs-out-0708.google.com ([64.233.178.242]:47870 "EHLO hs-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752619AbYJ1MGE (ORCPT ); Tue, 28 Oct 2008 08:06:04 -0400 Received: by hs-out-0708.google.com with SMTP id 4so715774hsl.5 for ; Tue, 28 Oct 2008 05:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:mime-version:content-type; bh=oGHo+CpdhzaHJQFP5ikU/MUdCstfI9sQ3XKrr5ikJZ4=; b=CrAScGrp4yQirk8jMINRGlMarEVyE5CNNgT5g+m2y10wp7C5jSehTS639tKT7Yj8Lj lO8xK+xv1XiaZ9qzbWZ+j1MnlWVXX62td2PO7NtQmy9j7+GxQkNAe9x4W5gW8gFgyDyV 63G+kTyZUuPjTYmRXxEJTOwu5CDgt6lDHYtI8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:mime-version:content-type; b=gdt76pP4noElcDs/ynbjaDU8Y7EMDw9f1j/4O4qg/wFFvUnCy8pjeBuRWXC6Ha0hxf EbTHLmIg8xSX19CXXcJ9nGt1HGNkC35Loz3hmRzCbbXxVQYaGMzCutmWu5/WK0T7VUDF QshhsmPA4NcIYToJUyTZckOOMGVLZLWjiBot0= Received: by 10.142.215.5 with SMTP id n5mr3312871wfg.131.1225195560672; Tue, 28 Oct 2008 05:06:00 -0700 (PDT) Received: by 10.142.239.4 with HTTP; Tue, 28 Oct 2008 05:06:00 -0700 (PDT) Message-ID: <87a5b0800810280506h71fd6508i9474917b0ef0b191@mail.gmail.com> Date: Tue, 28 Oct 2008 12:06:00 +0000 From: "Will Newton" To: linux-kernel Subject: [PATCH] drivers/net/smc911x.c: Fix lockdep warning on xmit. Cc: netdev , "Jeff Garzik" MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From 0e3ec7f78e115533e4aca9ac067acbc33eb0a21f Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 28 Oct 2008 10:52:36 +0000 Subject: [PATCH] drivers/net/smc911x.c: Fix lockdep warning on xmit. dev_kfree_skb should not be called with irqs disabled, use dev_kfree_skb_irq instead. The warning caused looks like this: netif_wake_queue(dev); From 0e3ec7f78e115533e4aca9ac067acbc33eb0a21f Mon Sep 17 00:00:00 2001 From: Will Newton Date: Tue, 28 Oct 2008 10:52:36 +0000 Subject: [PATCH] drivers/net/smc911x.c: Fix lockdep warning on xmit. dev_kfree_skb should not be called with irqs disabled, use dev_kfree_skb_irq instead. The warning caused looks like this: ====================================================== [ INFO: hard-safe -> hard-unsafe lock order detected ] 2.6.28-rc1 #273 ------------------------------------------------------ swapper/0 [HC0[0]:SC1[2]:HE0:SE0] is trying to acquire: (clock-AF_INET){-..+}, at: [<4015c17c>] _sock_def_write_space+0x28/0xd8 and this task is already holding: (&lp->lock){++..}, at: [<4013f230>] _smc911x_hard_start_xmit+0x30/0x4b8 which would create a new lock dependency: (&lp->lock){++..} -> (clock-AF_INET){-..+} Signed-off-by: Will Newton --- drivers/net/smc911x.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index f59c777..5051554 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -499,7 +499,7 @@ static void smc911x_hardware_send_pkt(struct net_device *dev) #else SMC_PUSH_DATA(lp, buf, len); dev->trans_start = jiffies; - dev_kfree_skb(skb); + dev_kfree_skb_irq(skb); #endif if (!lp->tx_throttle) { netif_wake_queue(dev); -- 1.5.5.2