Changeset 32671


Ignore:
Timestamp:
2012-07-12T00:18:09+02:00 (6 years ago)
Author:
hauke
Message:

mac80211: update brcmsmac patches

Location:
trunk/package/mac80211/patches
Files:
1 added
9 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/849-brcmsmac-add-device-found-on-some-SoCs-like-the-bcm4.patch

    r32655 r32671  
    1111--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    1212+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    13 @@ -752,7 +752,7 @@ static void brcms_c_ucode_bsinit(struct  
     13@@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct 
    1414        brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs); 
    1515  
     
    2020                        brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16); 
    2121                else 
    22 @@ -2277,7 +2277,7 @@ static void brcms_ucode_download(struct  
     22@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct 
    2323        if (wlc_hw->ucode_loaded) 
    2424                return; 
     
    2929                        brcms_ucode_write(wlc_hw, ucode->bcm43xx_16_mimo, 
    3030                                          ucode->bcm43xx_16_mimosz); 
    31 @@ -3239,7 +3239,7 @@ static void brcms_b_coreinit(struct brcm 
     31@@ -3221,7 +3221,7 @@ static void brcms_b_coreinit(struct brcm 
    3232  
    3333        sflags = bcma_aread32(core, BCMA_IOST); 
  • trunk/package/mac80211/patches/850-brcmsmac-add-support-for-BCM43224.patch

    r32655 r32671  
    11--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    22+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    3 @@ -4153,6 +4153,7 @@ void brcms_c_wme_setparams(struct brcms_ 
     3@@ -4135,6 +4135,7 @@ void brcms_c_wme_setparams(struct brcms_ 
    44                                          M_EDCF_QINFO + 
    55                                          wme_ac2fifo[aci] * M_EDCF_QLEN + i, 
     
    99  
    1010        if (suspend) { 
    11 @@ -4557,7 +4558,8 @@ static int brcms_b_attach(struct brcms_c 
     11@@ -4537,7 +4538,8 @@ static int brcms_b_attach(struct brcms_c 
    1212  
    1313        /* check device id(srom, nvram etc.) to set bands */ 
    1414        if (wlc_hw->deviceid == BCM43224_D11N_ID || 
    1515-           wlc_hw->deviceid == BCM43224_D11N_ID_VEN1) 
    16 +           wlc_hw->deviceid == BCM43224_D11N_ID_VEN1|| 
    17 +           wlc_hw->deviceid == BCM43224_CHIP_ID) 
     16+           wlc_hw->deviceid == BCM43224_D11N_ID_VEN1 || 
     17+           wlc_hw->deviceid == BCM43224_CHIP_ID) 
    1818                /* Dualband boards */ 
    1919                wlc_hw->_nbands = 2; 
    2020        else 
    21 @@ -5816,7 +5818,7 @@ bool brcms_c_chipmatch(u16 vendor, u16 d 
     21@@ -5797,7 +5799,7 @@ static bool brcms_c_chipmatch_pci(struct 
    2222                return false; 
    2323        } 
  • trunk/package/mac80211/patches/851-brcmsmac-start-adding-support-for-core-rev-28.patch

    r32655 r32671  
    1111--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    1212+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    13 @@ -752,7 +752,7 @@ static void brcms_c_ucode_bsinit(struct  
     13@@ -734,7 +734,7 @@ static void brcms_c_ucode_bsinit(struct 
    1414        brcms_c_write_mhf(wlc_hw, wlc_hw->band->mhfs); 
    1515  
     
    2020                        brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16); 
    2121                else 
    22 @@ -2277,7 +2277,7 @@ static void brcms_ucode_download(struct  
     22@@ -2259,7 +2259,7 @@ static void brcms_ucode_download(struct 
    2323        if (wlc_hw->ucode_loaded) 
    2424                return; 
     
    2929                        brcms_ucode_write(wlc_hw, ucode->bcm43xx_16_mimo, 
    3030                                          ucode->bcm43xx_16_mimosz); 
    31 @@ -3239,7 +3239,7 @@ static void brcms_b_coreinit(struct brcm 
     31@@ -3221,7 +3221,7 @@ static void brcms_b_coreinit(struct brcm 
    3232  
    3333        sflags = bcma_aread32(core, BCMA_IOST); 
     
    3838                        brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16); 
    3939                else 
     40@@ -5818,6 +5818,8 @@ static bool brcms_c_chipmatch_soc(struct 
     41  
     42        if (chipinfo->id == BCMA_CHIP_ID_BCM4716) 
     43                return true; 
     44+       if (chipinfo->id == BCMA_CHIP_ID_BCM5357) 
     45+               return true; 
     46  
     47        pr_err("unknown chip id %04x\n", chipinfo->id); 
     48        return false; 
    4049--- a/drivers/net/wireless/brcm80211/brcmsmac/main.h 
    4150+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.h 
Note: See TracChangeset for help on using the changeset viewer.