From patchwork Tue Mar 24 12:29:08 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ursula Braun X-Patchwork-Id: 24955 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 C96EFDDF3F for ; Tue, 24 Mar 2009 23:44:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760240AbZCXMnt (ORCPT ); Tue, 24 Mar 2009 08:43:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760218AbZCXMno (ORCPT ); Tue, 24 Mar 2009 08:43:44 -0400 Received: from mtagate2.de.ibm.com ([195.212.17.162]:57234 "EHLO mtagate2.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757603AbZCXMnj (ORCPT ); Tue, 24 Mar 2009 08:43:39 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate2.de.ibm.com (8.13.1/8.13.1) with ESMTP id n2OChblP022293; Tue, 24 Mar 2009 12:43:37 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n2OChaKi4112516; Tue, 24 Mar 2009 13:43:36 +0100 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n2OChaQ7014635; Tue, 24 Mar 2009 13:43:36 +0100 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n2OChZbN014630; Tue, 24 Mar 2009 13:43:35 +0100 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4267) id E1265122422D; Tue, 24 Mar 2009 13:43:35 +0100 (CET) Message-Id: <20090324124335.784434000@linux.vnet.ibm.com> User-Agent: quilt/0.47-1 Date: Tue, 24 Mar 2009 13:29:08 +0100 From: Ursula Braun To: davem@davemloft.net, netdev@vger.kernel.org, linux-s390@vger.kernel.org Cc: schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, Ursula Braun Subject: [patch 4/9] [PATCH] claw: invalid return codes from hard_start_xmit References: <20090324122904.744942000@linux.vnet.ibm.com> Content-Disposition: inline; filename=611-claw-rc-warning.diff Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ursula Braun Avoid kernel warnings by using the correct hard_start_xmit return code NETDEV_TX_BUSY for skb requeuing. Signed-off-by: Ursula Braun --- drivers/s390/net/claw.c | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff -urpN linux-2.6/drivers/s390/net/claw.c linux-2.6-patched/drivers/s390/net/claw.c --- linux-2.6/drivers/s390/net/claw.c 2008-12-25 00:26:37.000000000 +0100 +++ linux-2.6-patched/drivers/s390/net/claw.c 2009-03-04 15:58:30.000000000 +0100 @@ -335,6 +335,8 @@ claw_tx(struct sk_buff *skb, struct net_ rc=claw_hw_tx( skb, dev, 1 ); spin_unlock_irqrestore(get_ccwdev_lock(p_ch->cdev), saveflags); CLAW_DBF_TEXT_(4, trace, "clawtx%d", rc); + if (rc) + rc = NETDEV_TX_BUSY; return rc; } /* end of claw_tx */