mac80211: update to wireless-testing 2012-06-14
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 840-brcmsmac-remove-PCIE.patch
1 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
2 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
3 @@ -320,9 +320,7 @@
4 #define IS_SIM(chippkg) \
5 ((chippkg == HDLSIM_PKG_ID) || (chippkg == HWSIM_PKG_ID))
6
7 -#define PCIE(sih) (ai_get_buscoretype(sih) == PCIE_CORE_ID)
8 -
9 -#define PCI_FORCEHT(sih) (PCIE(sih) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
10 +#define PCI_FORCEHT(sih) ((ai_get_buscoretype(sih) == PCIE_CORE_ID) && (ai_get_chip_id(sih) == BCM4716_CHIP_ID))
11
12 #ifdef DEBUG
13 #define SI_MSG(fmt, ...) pr_debug(fmt, ##__VA_ARGS__)
14 @@ -776,7 +774,7 @@ void ai_pci_up(struct si_pub *sih)
15 bcma_core_set_clockmode(cc, BCMA_CLKMODE_FAST);
16 }
17
18 - if (PCIE(sih))
19 + if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
20 bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
21 }
22
23 @@ -794,7 +792,7 @@ void ai_pci_down(struct si_pub *sih)
24 bcma_core_set_clockmode(cc, BCMA_CLKMODE_DYNAMIC);
25 }
26
27 - if (PCIE(sih))
28 + if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
29 bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
30 }
31