From patchwork Wed Aug 20 22:17:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Einon X-Patchwork-Id: 381829 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 4E38214011D for ; Thu, 21 Aug 2014 08:19:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753471AbaHTWTK (ORCPT ); Wed, 20 Aug 2014 18:19:10 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:53310 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753352AbaHTWSS (ORCPT ); Wed, 20 Aug 2014 18:18:18 -0400 Received: by mail-wi0-f176.google.com with SMTP id bs8so7817497wib.3 for ; Wed, 20 Aug 2014 15:18:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vnh1wdmuFLeP8Sdk8Am839TONKyTIQ5HKX96R5iSy64=; b=WkGR9XabAn9VvR0hw37YYTCrKOLJBu5+kcGFE4L+rm4z6fOKY36lM0Snw+EX8P6QDn gOOXI1wDI0sPAdG07gbAjeXM4xt1Obu/m3d9SkzZNzi6D4EICYHadUiU5jMrXAgc8dlF Dfi3VRC9J11UF3MX4EV6qoRjWzqjUxTbE+erD0HC+S7FHVMn4i0TWCIU+rtEUomKuUmV 5aeWQwcThY6QM0Q0ebkDLITpUThfDocbjpHygqVbb61g/yFrXyQsebEK8HZB28QUT1WO C7EzWMJwiuPKrdjGV2GqwqHEO7tfcBP6bHnbZ+PGGZ2ALJpMPGXpD08bq1VqtR8GtfBv tNfA== X-Received: by 10.194.187.101 with SMTP id fr5mr62969108wjc.10.1408573096840; Wed, 20 Aug 2014 15:18:16 -0700 (PDT) Received: from msilap.einon.net ([80.229.23.162]) by mx.google.com with ESMTPSA id f3sm13378073wiz.0.2014.08.20.15.18.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Aug 2014 15:18:16 -0700 (PDT) From: Mark Einon To: gregkh@linuxfoundation.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Mark Einon Subject: [PATCH 6/8] staging: et131x: Rename NUM_PACKETS_HANDLED to MAX_PACKETS_HANDLED Date: Wed, 20 Aug 2014 23:17:56 +0100 Message-Id: <1408573078-9320-7-git-send-email-mark.einon@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1408573078-9320-1-git-send-email-mark.einon@gmail.com> References: <1408573078-9320-1-git-send-email-mark.einon@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org To better describe it's use as a hard limit. Signed-off-by: Mark Einon --- drivers/staging/et131x/et131x.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 551b250..df83ea3 100644 --- a/drivers/staging/et131x/et131x.c +++ b/drivers/staging/et131x/et131x.c @@ -179,7 +179,7 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver for the ET1310 by Agere S #define NIC_DEFAULT_NUM_RFD 1024 #define NUM_FBRS 2 -#define NUM_PACKETS_HANDLED 256 +#define MAX_PACKETS_HANDLED 256 #define ALCATEL_MULTICAST_PKT 0x01000000 #define ALCATEL_BROADCAST_PKT 0x02000000 @@ -2557,7 +2557,7 @@ static void et131x_handle_recv_interrupt(struct et131x_adapter *adapter) struct rx_ring *rx_ring = &adapter->rx_ring; /* Process up to available RFD's */ - while (count < NUM_PACKETS_HANDLED) { + while (count < MAX_PACKETS_HANDLED) { if (list_empty(&rx_ring->recv_list)) { WARN_ON(rx_ring->num_ready_recv != 0); done = false; @@ -2589,7 +2589,7 @@ static void et131x_handle_recv_interrupt(struct et131x_adapter *adapter) count++; } - if (count == NUM_PACKETS_HANDLED || !done) { + if (count == MAX_PACKETS_HANDLED || !done) { rx_ring->unfinished_receives = true; writel(PARM_TX_TIME_INT_DEF * NANO_IN_A_MICRO, &adapter->regs->global.watchdog_timer);