From owner-cvs-src@FreeBSD.ORG  Wed Dec 28 17:00:17 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3E5CF16A41F;
	Wed, 28 Dec 2005 17:00:17 +0000 (GMT) (envelope-from nate@root.org)
Received: from www.cryptography.com (li-22.members.linode.com [64.5.53.22])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4202943D58;
	Wed, 28 Dec 2005 17:00:15 +0000 (GMT) (envelope-from nate@root.org)
Received: from [10.0.0.240] (ppp-71-139-31-194.dsl.snfc21.pacbell.net
	[71.139.31.194])
	by www.cryptography.com (8.12.8/8.12.8) with ESMTP id jBSH0Q9e002956
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Wed, 28 Dec 2005 09:00:27 -0800
Message-ID: <43B2C323.7070501@root.org>
Date: Wed, 28 Dec 2005 08:53:55 -0800
From: Nate Lawson <nate@root.org>
User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Gleb Smirnoff <glebius@FreeBSD.org>
References: <20051228132120.BD71816A45D@hub.freebsd.org>
In-Reply-To: <20051228132120.BD71816A45D@hub.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/dev/dc if_dc.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Dec 2005 17:00:17 -0000

Gleb Smirnoff wrote:
> glebius     2005-12-28 13:21:05 UTC
> 
>   FreeBSD src repository
> 
>   Modified files:
>     sys/dev/dc           if_dc.c 
>   Log:
>   Check for IFF_DRV_RUNNING in the interrupt loop.
>   
>   Reported & tested by:   Martin P. Hansen <mph lima.dyndns.dk>
>   
>   Revision  Changes    Path
>   1.177     +3 -2      src/sys/dev/dc/if_dc.c
> 
> 
> Index: src/sys/dev/dc/if_dc.c
> diff -u src/sys/dev/dc/if_dc.c:1.176 src/sys/dev/dc/if_dc.c:1.177
> --- src/sys/dev/dc/if_dc.c:1.176	Mon Dec  5 12:32:20 2005
> +++ src/sys/dev/dc/if_dc.c	Wed Dec 28 13:21:05 2005
> @@ -3138,8 +3138,9 @@
>  	/* Disable interrupts. */
>  	CSR_WRITE_4(sc, DC_IMR, 0x00000000);
>  
> -	while (((status = CSR_READ_4(sc, DC_ISR)) & DC_INTRS)
> -	      && status != 0xFFFFFFFF) {
> +	while (((status = CSR_READ_4(sc, DC_ISR)) & DC_INTRS) &&
> +	    status != 0xFFFFFFFF &&
> +	    ifp->if_drv_flags & IFF_DRV_RUNNING) {
>  
>  		CSR_WRITE_4(sc, DC_ISR, status);
>  

Need parens around the if_drv_flags check.  This code is broken without it.

-- 
Nate