svn commit: r193612 - in stable/7/sys: . contrib/pf dev/age
dev/ath/ath_hal dev/cxgb
Pyun YongHyeon
yongari at FreeBSD.org
Sun Jun 7 05:08:22 UTC 2009
Author: yongari
Date: Sun Jun 7 05:08:20 2009
New Revision: 193612
URL: http://svn.freebsd.org/changeset/base/193612
Log:
MFC r192418:
pci(4) handles PCIM_CMD_INTxDIS so there is no need to poke this
bit in driver.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/age/if_age.c
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
Modified: stable/7/sys/dev/age/if_age.c
==============================================================================
--- stable/7/sys/dev/age/if_age.c Sun Jun 7 04:58:34 2009 (r193611)
+++ stable/7/sys/dev/age/if_age.c Sun Jun 7 05:08:20 2009 (r193612)
@@ -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;
if ((ifp->if_flags & IFF_UP) != 0)
age_init_locked(sc);
More information about the svn-src-stable-7
mailing list