svn commit: r192417 - in stable/7/sys: . contrib/pf dev/ale dev/ath/ath_hal dev/cxgb

[Pyun YongHyeon]

Author: yongari
Date: Wed May 20 03:28:35 2009
New Revision: 192417
URL: http://svn.freebsd.org/changeset/base/192417

Log:
  MFC r189379:
    Now 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/ale/if_ale.c
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/ale/if_ale.c
==============================================================================
--- stable/7/sys/dev/ale/if_ale.c	Wed May 20 02:51:48 2009	(r192416)
+++ stable/7/sys/dev/ale/if_ale.c	Wed May 20 03:28:35 2009	(r192417)
@@ -1543,20 +1543,11 @@ ale_resume(device_t dev)
 	struct ale_softc *sc;
 	struct ifnet *ifp;
 	int pmc;
-	uint16_t cmd, pmstat;
+	uint16_t pmstat;
 
 	sc = device_get_softc(dev);
 
 	ALE_LOCK(sc);
-	/*
-	 * Clear INTx emulation disable for hardwares that
-	 * is set in resume event. From Linux.
-	 */
-	cmd = pci_read_config(sc->ale_dev, PCIR_COMMAND, 2);
-	if ((cmd & 0x0400) != 0) {
-		cmd &= ~0x0400;
-		pci_write_config(sc->ale_dev, PCIR_COMMAND, cmd, 2);
-	}
 	if (pci_find_extcap(sc->ale_dev, PCIY_PMG, &pmc) == 0) {
 		/* Disable PME and clear PME status. */
 		pmstat = pci_read_config(sc->ale_dev,