AA: kernel: refresh patches
[12.09/openwrt.git] / package / mac80211 / patches / 321-bcma_backport.patch
1 --- a/drivers/net/wireless/b43/main.c
2 +++ b/drivers/net/wireless/b43/main.c
3 @@ -4697,7 +4697,7 @@ static int b43_wireless_core_init(struct
4         switch (dev->dev->bus_type) {
5  #ifdef CONFIG_B43_BCMA
6         case B43_BUS_BCMA:
7 -               bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci[0],
8 +               bcma_core_pci_irq_ctl(&dev->dev->bdev->bus->drv_pci,
9                                       dev->dev->bdev, true);
10                 break;
11  #endif
12 --- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
13 +++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
14 @@ -694,7 +694,7 @@ void ai_pci_up(struct si_pub *sih)
15         sii = container_of(sih, struct si_info, pub);
16  
17         if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
18 -               bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], true);
19 +               bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, true);
20  }
21  
22  /* Unconfigure and/or apply various WARs when going down */
23 @@ -705,7 +705,7 @@ void ai_pci_down(struct si_pub *sih)
24         sii = container_of(sih, struct si_info, pub);
25  
26         if (sii->icbus->hosttype == BCMA_HOSTTYPE_PCI)
27 -               bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci[0], false);
28 +               bcma_core_pci_extend_L1timer(&sii->icbus->drv_pci, false);
29  }
30  
31  /* Enable BT-COEX & Ex-PA for 4313 */
32 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
33 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
34 @@ -4979,7 +4979,7 @@ static int brcms_b_up_prep(struct brcms_
35          * Configure pci/pcmcia here instead of in brcms_c_attach()
36          * to allow mfg hotswap:  down, hotswap (chip power cycle), up.
37          */
38 -       bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci[0], wlc_hw->d11core,
39 +       bcma_core_pci_irq_ctl(&wlc_hw->d11core->bus->drv_pci, wlc_hw->d11core,
40                               true);
41  
42         /*