upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Probe with BUS_PROBE_DEFAULT instead of 0.

Browse source 
- Remove clearing PCIM_CMD_INTxDIS; pci(4) will do that as appropriate since
  r189367.

MFC after:	1 week
This commit is contained in:
Marius Strobl 2013-12-30 16:46:50 +00:00
parent 68ca2e2ebb
commit e0c758686c
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/dev/iwn/if_iwn.c
View file

@ -380,7 +380,7 @@ iwn_probe(device_t dev)
if (pci_get_vendor(dev) == ident->vendor &&
pci_get_device(dev) == ident->device) {
device_set_desc(dev, ident->name);
return 0;
return (BUS_PROBE_DEFAULT);
}
}
return ENXIO;
@ -392,7 +392,6 @@ iwn_attach(device_t dev)
struct iwn_softc *sc = (struct iwn_softc *)device_get_softc(dev);
struct ieee80211com *ic;
struct ifnet *ifp;
uint32_t reg;
int i, error, rid;
uint8_t macaddr[IEEE80211_ADDR_LEN];
@ -422,15 +421,6 @@ iwn_attach(device_t dev)
/* Clear device-specific "PCI retry timeout" register (41h). */
pci_write_config(dev, 0x41, 0, 1);
/* Hardware bug workaround. */
reg = pci_read_config(dev, PCIR_COMMAND, 2);
if (reg & PCIM_CMD_INTxDIS) {
DPRINTF(sc, IWN_DEBUG_RESET, "%s: PCIe INTx Disable set\n",
__func__);
reg &= ~PCIM_CMD_INTxDIS;
pci_write_config(dev, PCIR_COMMAND, reg, 2);
}
/* Enable bus-mastering. */
pci_enable_busmaster(dev);
@ -6066,7 +6056,6 @@ iwn_send_advanced_btcoex(struct iwn_softc *sc)
sizeof(btconfig), 1);
}
if (error != 0)
return error;