From patchwork Tue Mar 31 15:05:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atsushi Nemoto X-Patchwork-Id: 25414 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 5E400DDED6 for ; Wed, 1 Apr 2009 02:05:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760319AbZCaPFI (ORCPT ); Tue, 31 Mar 2009 11:05:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759570AbZCaPFH (ORCPT ); Tue, 31 Mar 2009 11:05:07 -0400 Received: from mba.ocn.ne.jp ([122.1.235.107]:53636 "EHLO smtp.mba.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759048AbZCaPFG (ORCPT ); Tue, 31 Mar 2009 11:05:06 -0400 Received: from localhost.localdomain (p6205-ipad211funabasi.chiba.ocn.ne.jp [58.91.162.205]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 3AC90A320; Wed, 1 Apr 2009 00:05:01 +0900 (JST) From: Atsushi Nemoto To: Jeff Garzik Cc: Stephen Hemminger , netdev@vger.kernel.org Subject: [PATCH] tc35815: Fix build error if NAPI enabled Date: Wed, 1 Apr 2009 00:05:02 +0900 Message-Id: <1238511902-6853-1-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This driver contains experimental NAPI code disabled by default. The commit bea3348ee ("[NET]: Make NAPI polling independent of struct net_device objects.") converted the NAPI path of this driver but that conversion was not complete. This patch fixes a build error introduced by the commit. Signed-off-by: Atsushi Nemoto --- drivers/net/tc35815.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index bcd0e60..ad9848e 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -1908,7 +1908,7 @@ static int tc35815_poll(struct napi_struct *napi, int budget) do { tc_writel(status, &tr->Int_Src); /* write to clear */ - handled = tc35815_do_interrupt(dev, status, limit); + handled = tc35815_do_interrupt(dev, status, budget - received); if (handled >= 0) { received += handled; if (received >= budget)