32 lines
1 KiB
Diff
32 lines
1 KiB
Diff
|
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
||
|
|
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
|
||
|
|
@@ -320,9 +320,7 @@
|
||
|
|
#define IS_SIM(chippkg) \
|
||
|
|
((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
|
||
|
|
|
||
|
|
-#define PCIE(sih) (ai_get_buscoretype(sih) == PCIE_CORE_ID)
|
||
|
|
-
|
||
|
|
-#define PCI_FORCEHT(sih) (PCIE(sih) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
|
||
|
|
+#define PCI_FORCEHT(sih) ((ai_get_buscoretype(sih) == PCIE_CORE_ID) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
|
||
|
|
|
||
|
|
#ifdef DEBUG
|
||
|
|
#define SI_MSG(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
|
||
|
|
@@ -777,7 +775,7 @@ void ai_pci_up(struct si_pub *sih)
|
||
|
|
bcma_core_set_clockmode(cc, BCMA_CLKMODE_FAST);
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (PCIE(sih))
|
||
|
|
+ if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
|
||
|
|
bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -795,7 +793,7 @@ void ai_pci_down(struct si_pub *sih)
|
||
|
|
bcma_core_set_clockmode(cc, BCMA_CLKMODE_DYNAMIC);
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (PCIE(sih))
|
||
|
|
+ if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
|
||
|
|
bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
|
||
|
|
}
|
||
|
|
|