From patchwork Mon Feb 16 13:55:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 23219 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 640AFDDDF3 for ; Tue, 17 Feb 2009 00:55:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756920AbZBPNz0 (ORCPT ); Mon, 16 Feb 2009 08:55:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756828AbZBPNzZ (ORCPT ); Mon, 16 Feb 2009 08:55:25 -0500 Received: from mail-fx0-f20.google.com ([209.85.220.20]:35648 "EHLO mail-fx0-f20.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756196AbZBPNzZ (ORCPT ); Mon, 16 Feb 2009 08:55:25 -0500 Received: by fxm13 with SMTP id 13so5834024fxm.13 for ; Mon, 16 Feb 2009 05:55:23 -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=AiW2t/vmpfY6zPMhA4SfiIN3iIJHQ2eu8wnLqcXBkh4=; b=OOLtCZ3/aIIvSB8Pa9e35LHvBLd0xZ3cdsLvEPS9F/vmRwtLsqExZDq/EDhpGU5s/j cn8veUNV+pKf3lJCRe18CmaNZ0+AkaZdgSJvrjk3be/sJr2jBqmd/HXj8HqJcHQ5mEWP NHbeNYHLznGFHhuxcl9AwOIJzNXvvWKQdpOEg= 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=XoziIAz5adP7qSNSHeBWKdYCWuLWglvhcx0ykCDHKfFpW/juTr2B+u1wUsmo5bNLvh uLigdJaWwiVp6gmesjJUldr9W/P9Vyfb/+aNUJuaEpJtOzqPR2N0XMyRdDU76PVKpuqx OOHtxqN5OpFdO0RBbYeJutmbExq8CPTBbvfaU= Received: by 10.223.127.8 with SMTP id e8mr3566428fas.95.1234792522922; Mon, 16 Feb 2009 05:55:22 -0800 (PST) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id i7sm3261534nfh.26.2009.02.16.05.55.22 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 16 Feb 2009 05:55:22 -0800 (PST) Message-ID: <4999704A.9030004@gmail.com> Date: Mon, 16 Feb 2009 14:55:22 +0100 From: Roel Kluin User-Agent: Thunderbird 2.0.0.18 (X11/20081105) MIME-Version: 1.0 To: dhananjay@netxen.com CC: netdev@vger.kernel.org, Andrew Morton Subject: [PATCH] netxen: only half timeout waited Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Only half the timeout was waited, due to the double increment, and an error occurred one too early. Signed-off-by: Roel Kluin --- -- 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/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c index c3b9c83..df3aa08 100644 --- a/drivers/net/netxen/netxen_nic_niu.c +++ b/drivers/net/netxen/netxen_nic_niu.c @@ -147,12 +147,11 @@ int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long reg, NETXEN_NIU_GB_MII_MGMT_INDICATE(0), &status, 4)) return -EIO; - timeout++; } while ((netxen_get_gb_mii_mgmt_busy(status) || netxen_get_gb_mii_mgmt_notvalid(status)) && (timeout++ < NETXEN_NIU_PHY_WAITMAX)); - if (timeout < NETXEN_NIU_PHY_WAITMAX) { + if (timeout <= NETXEN_NIU_PHY_WAITMAX) { if (adapter->hw_read_wx(adapter, NETXEN_NIU_GB_MII_MGMT_STATUS(0), readval, 4)) @@ -240,11 +239,10 @@ int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long reg, NETXEN_NIU_GB_MII_MGMT_INDICATE(0), &status, 4)) return -EIO; - timeout++; } while ((netxen_get_gb_mii_mgmt_busy(status)) && (timeout++ < NETXEN_NIU_PHY_WAITMAX)); - if (timeout < NETXEN_NIU_PHY_WAITMAX) + if (timeout <= NETXEN_NIU_PHY_WAITMAX) result = 0; else result = -EIO;