From patchwork Tue Mar 24 12:29:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ursula Braun X-Patchwork-Id: 24957 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 519FADDF3F for ; Tue, 24 Mar 2009 23:44:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760263AbZCXMnx (ORCPT ); Tue, 24 Mar 2009 08:43:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760236AbZCXMnv (ORCPT ); Tue, 24 Mar 2009 08:43:51 -0400 Received: from mtagate6.de.ibm.com ([195.212.29.155]:43468 "EHLO mtagate6.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758480AbZCXMnj (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 mtagate6.de.ibm.com (8.14.3/8.13.8) with ESMTP id n2OChaqM297742; Tue, 24 Mar 2009 12:43:36 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 n2OChasY4112514; 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 n2OChZ8P014624; 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 n2OChZ0n014616; Tue, 24 Mar 2009 13:43:35 +0100 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 4267) id BD6131224229; Tue, 24 Mar 2009 13:43:35 +0100 (CET) Message-Id: <20090324124335.540737000@linux.vnet.ibm.com> User-Agent: quilt/0.47-1 Date: Tue, 24 Mar 2009 13:29:07 +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 3/9] [PATCH] netiucv: invalid return code from hard_start_xmit References: <20090324122904.744942000@linux.vnet.ibm.com> Content-Disposition: inline; filename=610-netiucv-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 warning by using the correct hard_start_xmit return code NETDEV_TX_BUSY for skb requeuing. Signed-off-by: Ursula Braun --- drivers/s390/net/netiucv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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/netiucv.c linux-2.6-patched/drivers/s390/net/netiucv.c --- linux-2.6/drivers/s390/net/netiucv.c 2009-03-04 15:58:03.000000000 +0100 +++ linux-2.6-patched/drivers/s390/net/netiucv.c 2009-03-04 15:58:30.000000000 +0100 @@ -1312,7 +1312,7 @@ static int netiucv_tx(struct sk_buff *sk if (netiucv_test_and_set_busy(dev)) { IUCV_DBF_TEXT(data, 2, "EBUSY from netiucv_tx\n"); - return -EBUSY; + return NETDEV_TX_BUSY; } dev->trans_start = jiffies; rc = netiucv_transmit_skb(privptr->conn, skb) != 0;