package/mac80211/patches/840-b43-brcmsmac-use-pcie-core-arry.patch

   1 diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
   2 index 73730e9..7358ea2 100644
   3 --- a/drivers/net/wireless/b43/main.c
   4 +++ b/drivers/net/wireless/b43/main.c
   5 @@ -4652,7 +4652,7 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
   6         switch (dev->dev->bus_type) {
   7  #ifdef CONFIG_B43_BCMA
   8         case B43_BUS_BCMA:
   9 -               bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci,
  10 +               bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],
  11                                       dev->dev->bdev, true);
  12                 break;
  13  #endif
  14 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
  15 index b89f127..de96290 100644
  16 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
  17 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
  18 @@ -692,7 +692,7 @@ void ai_pci_up(struct si_pub *sih)
  19         sii = container_of(sih, struct si_info, pub);
  20
  21         if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
  22 -               bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
  23 +               bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], true);
  24  }
  25
  26  /* Unconfigure and/or apply various WARs when going down */
  27 @@ -703,7 +703,7 @@ void ai_pci_down(struct si_pub *sih)
  28         sii = container_of(sih, struct si_info, pub);
  29
  30         if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
  31 -               bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
  32 +               bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], false);
  33  }
  34
  35  /* Enable BT-COEX & Ex-PA for 4313 */
  36 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
  37 index 75086b3..565c15a 100644
  38 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
  39 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
  40 @@ -5077,7 +5077,7 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
  41          * Configure pci/pcmcia here instead of in brcms_c_attach()
  42          * to allow mfg hotswap:  down, hotswap (chip power cycle), up.
  43          */
  44 -       bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci, wlc_hw->d11core,
  45 +       bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci[0], wlc_hw->d11core,
  46                               true);
  47
  48         /*