From patchwork Mon Oct 26 13:46:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atsushi Nemoto X-Patchwork-Id: 36908 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 32538B7B9D for ; Tue, 27 Oct 2009 00:46:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752023AbZJZNqX (ORCPT ); Mon, 26 Oct 2009 09:46:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751973AbZJZNqW (ORCPT ); Mon, 26 Oct 2009 09:46:22 -0400 Received: from mba.ocn.ne.jp ([122.28.14.163]:58164 "EHLO smtp.mba.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751920AbZJZNqV (ORCPT ); Mon, 26 Oct 2009 09:46:21 -0400 Received: from localhost.localdomain (p5091-ipad304funabasi.chiba.ocn.ne.jp [123.217.159.91]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id E46A06C4F; Mon, 26 Oct 2009 22:46:20 +0900 (JST) From: Atsushi Nemoto To: netdev@vger.kernel.org Cc: David Miller , Ralf Roesch Subject: [PATCH 1/2] tc35815: Fix return value of tc35815_do_interrupt when NAPI enabled Date: Mon, 26 Oct 2009 22:46:21 +0900 Message-Id: <1256564782-2781-1-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Return received count correctly even if tx completed at the same time. Currently NAPI is disabled for this driver so this patch does not fix any real problem. Signed-off-by: Atsushi Nemoto --- drivers/net/tc35815.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index d1298e5..3d38479 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -1592,7 +1592,12 @@ static int tc35815_do_interrupt(struct net_device *dev, u32 status) lp->lstats.tx_ints++; tc35815_txdone(dev); netif_wake_queue(dev); +#ifdef TC35815_NAPI + if (ret < 0) + ret = 0; +#else ret = 0; +#endif } return ret; }