svn commit: r192418 - head/sys/dev/age

[Andrew Thompson]

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