From patchwork Wed Feb 25 11:15:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 23709 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 EFBCADDEE1 for ; Wed, 25 Feb 2009 22:16:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760749AbZBYLQE (ORCPT ); Wed, 25 Feb 2009 06:16:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760766AbZBYLQD (ORCPT ); Wed, 25 Feb 2009 06:16:03 -0500 Received: from qw-out-2122.google.com ([74.125.92.24]:28945 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760728AbZBYLQB (ORCPT ); Wed, 25 Feb 2009 06:16:01 -0500 Received: by qw-out-2122.google.com with SMTP id 5so2637772qwi.37 for ; Wed, 25 Feb 2009 03:15:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=keCoh64G9dUR65Q1xKhBks50az/Kua2aiL4Xj13OupI=; b=wzeyOy0txyQCXGhCi9l2A07AZ8WmgejPjZvt/T1Ik1kTecFeGig3bdmpoJY1H3Scj1 wf0xsKxt3AjHXHp42TmRZLMOEJBkUPc96Uz93WztMdYnne6+M3xN+vTTen9hrnBkOtni rSE02TN7Ql0JV+zURkU+W0GuKFETZ5jdPiff0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=Yy6APyk0OoJ5tb7EEiIu2a1yzF1bZ4bmRGUKUl/JB8ZYNRlxZVAz5mwA9qStMqb5gL /axZC3TcxtV4LDS7rpsgvt67Oh+QmPgZD4wx769gQau9ZgB4pt2DLiYHmdUOSeuDbXPr qjFYf/l9+vA1oD7Yb0P3XNhdYPc89olHp2IxQ= Received: by 10.224.2.141 with SMTP id 13mr384134qaj.296.1235560558745; Wed, 25 Feb 2009 03:15:58 -0800 (PST) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 24sm22010779ugf.36.2009.02.25.03.15.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 25 Feb 2009 03:15:58 -0800 (PST) Message-ID: <49A5286D.80304@gmail.com> Date: Wed, 25 Feb 2009 12:15:57 +0100 From: Roel Kluin User-Agent: Thunderbird 2.0.0.18 (X11/20081105) MIME-Version: 1.0 To: "David S. Miller" CC: netdev@vger.kernel.org, Andrew Morton Subject: [PATCH] net: more timeouts that reach -1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org These were not previously reported by me. ------------------------------>8-------------8<--------------------------------- with while (timeout-- > 0); timeout reaches -1 after the loop, so the tests below are off by one. Signed-off-by: Roel Kluin --- drivers/net/arm/ks8695net.c | 2 +- drivers/net/jme.c | 3 ++- drivers/net/ucc_geth_mii.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) -- 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 --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index 1cf2f94..f3a1274 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c @@ -560,7 +560,7 @@ ks8695_reset(struct ks8695_priv *ksp) msleep(1); } - if (reset_timeout == 0) { + if (reset_timeout < 0) { dev_crit(ksp->dev, "Timeout waiting for DMA engines to reset\n"); /* And blithely carry on */ diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 08b3405..0173ed0 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -957,7 +957,8 @@ jme_process_receive(struct jme_adapter *jme, int limit) goto out_inc; i = atomic_read(&rxring->next_to_clean); - while (limit-- > 0) { + while (limit > 0) { + limit--; rxdesc = rxring->desc; rxdesc += i; diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c index 5463591..7b1b46c 100644 --- a/drivers/net/ucc_geth_mii.c +++ b/drivers/net/ucc_geth_mii.c @@ -123,7 +123,7 @@ static int uec_mdio_reset(struct mii_bus *bus) mutex_unlock(&bus->mdio_lock); - if (timeout <= 0) { + if (timeout < 0) { printk(KERN_ERR "%s: The MII Bus is stuck!\n", bus->name); return -EBUSY; }