From owner-svn-src-head@FreeBSD.ORG  Wed May 20 05:24:12 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14C86106564A;
	Wed, 20 May 2009 05:24:12 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from pele.citylink.co.nz (pele.citylink.co.nz [202.8.44.226])
	by mx1.freebsd.org (Postfix) with ESMTP id C4F928FC08;
	Wed, 20 May 2009 05:24:07 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1])
	by pele.citylink.co.nz (Postfix) with ESMTP id 88D9CFF01;
	Wed, 20 May 2009 17:24:06 +1200 (NZST)
X-Virus-Scanned: Debian amavisd-new at citylink.co.nz
Received: from pele.citylink.co.nz ([127.0.0.1])
	by localhost (pele.citylink.co.nz [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id FwGrNvuP715D; Wed, 20 May 2009 17:24:01 +1200 (NZST)
Received: from citylink.fud.org.nz (unknown [202.8.44.45])
	by pele.citylink.co.nz (Postfix) with ESMTP;
	Wed, 20 May 2009 17:24:01 +1200 (NZST)
Received: by citylink.fud.org.nz (Postfix, from userid 1001)
	id 56EFF11432; Wed, 20 May 2009 17:24:01 +1200 (NZST)
Date: Tue, 19 May 2009 22:24:01 -0700
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Pyun YongHyeon <yongari@FreeBSD.org>
Message-ID: <20090520052401.GL78829@citylink.fud.org.nz>
References: <200905200333.n4K3XRKj017947@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200905200333.n4K3XRKj017947@svn.freebsd.org>
User-Agent: Mutt/1.5.17 (2007-11-01)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org
Subject: Re: svn commit: r192418 - head/sys/dev/age
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 May 2009 05:24:12 -0000

On Wed, May 20, 2009 at 03:33:27AM +0000, Pyun YongHyeon wrote:
> Author: yongari
> Date: Wed May 20 03:33:27 2009
> New Revision: 192418
> URL: http://svn.freebsd.org/changeset/base/192418
> 
> Log:
>   pci(4) handles PCIM_CMD_INTxDIS so there is no need to poke this
>   bit in driver.
> 
> Modified:
>   head/sys/dev/age/if_age.c
> 
> Modified: head/sys/dev/age/if_age.c
> ==============================================================================
> --- head/sys/dev/age/if_age.c	Wed May 20 03:28:35 2009	(r192417)
> +++ head/sys/dev/age/if_age.c	Wed May 20 03:33:27 2009	(r192418)
> @@ -1477,23 +1477,11 @@ age_resume(device_t dev)
>  {
>  	struct age_softc *sc;
>  	struct ifnet *ifp;
> -	uint16_t cmd;
>  
>  	sc = device_get_softc(dev);
>  
>  	AGE_LOCK(sc);
> -	/*
> -	 * Clear INTx emulation disable for hardwares that
> -	 * is set in resume event. From Linux.
> -	 */
> -	cmd = pci_read_config(sc->age_dev, PCIR_COMMAND, 2);
> -	if ((cmd & 0x0400) != 0) {
> -		cmd &= ~0x0400;
> -		pci_write_config(sc->age_dev, PCIR_COMMAND, cmd, 2);
> -	}
> -	AGE_UNLOCK(sc);
>  	age_phy_reset(sc);
> -	AGE_LOCK(sc);
>  	ifp = sc->age_ifp;

age_phy_reset() was previously called unlocked and is now the opposite,
is this intended?


Andrew