Changeset 44597


Ignore:
Timestamp:
2015-03-04T08:08:39+01:00 (3 years ago)
Author:
rmilecki
Message:

kernel: backport bcma changes to 3.19 and 4.0

Signed-off-by: Rafał Miłecki <zajec5@…>

Location:
trunk/target/linux/generic
Files:
1 edited
3 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.19/021-bcma-from-4.1.patch

    r44596 r44597  
    275275--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    276276+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    277 @@ -4669,7 +4669,7 @@ static int brcms_b_attach(struct brcms_c 
     277@@ -4668,7 +4668,7 @@ static int brcms_b_attach(struct brcms_c 
    278278        brcms_c_coredisable(wlc_hw); 
    279279  
     
    284284        /* turn off pll and xtal to match driver "down" state */ 
    285285        brcms_b_xtal(wlc_hw, OFF); 
    286 @@ -4960,7 +4960,7 @@ static int brcms_b_up_prep(struct brcms_ 
     286@@ -4959,7 +4959,7 @@ static int brcms_b_up_prep(struct brcms_ 
    287287         * Configure pci/pcmcia here instead of in brcms_c_attach() 
    288288         * to allow mfg hotswap:  down, hotswap (chip power cycle), up. 
     
    293293  
    294294        /* 
    295 @@ -4970,12 +4970,12 @@ static int brcms_b_up_prep(struct brcms_ 
     295@@ -4969,12 +4969,12 @@ static int brcms_b_up_prep(struct brcms_ 
    296296         */ 
    297297        if (brcms_b_radio_read_hwdisabled(wlc_hw)) { 
     
    308308        /* reset the d11 core */ 
    309309        brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS); 
    310 @@ -5172,7 +5172,7 @@ static int brcms_b_down_finish(struct br 
     310@@ -5171,7 +5171,7 @@ static int brcms_b_down_finish(struct br 
    311311  
    312312                /* turn off primary xtal and pll */ 
  • trunk/target/linux/generic/patches-3.19/700-swconfig.patch

    r44126 r44597  
    3030--- a/include/uapi/linux/Kbuild 
    3131+++ b/include/uapi/linux/Kbuild 
    32 @@ -379,6 +379,7 @@ header-y += stddef.h 
     32@@ -378,6 +378,7 @@ header-y += stddef.h 
    3333 header-y += string.h 
    3434 header-y += suspend_ioctls.h 
  • trunk/target/linux/generic/patches-4.0/021-bcma-from-4.1.patch

    r44596 r44597  
    252252--- a/drivers/net/wireless/b43/main.c 
    253253+++ b/drivers/net/wireless/b43/main.c 
    254 @@ -4650,7 +4650,7 @@ static void b43_wireless_core_exit(struc 
     254@@ -4819,7 +4819,7 @@ static void b43_wireless_core_exit(struc 
    255255        switch (dev->dev->bus_type) { 
    256256 #ifdef CONFIG_B43_BCMA 
     
    261261 #endif 
    262262 #ifdef CONFIG_B43_SSB 
    263 @@ -4697,9 +4697,9 @@ static int b43_wireless_core_init(struct 
     263@@ -4866,9 +4866,9 @@ static int b43_wireless_core_init(struct 
    264264        switch (dev->dev->bus_type) { 
    265265 #ifdef CONFIG_B43_BCMA 
     
    275275--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    276276+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c 
    277 @@ -4669,7 +4669,7 @@ static int brcms_b_attach(struct brcms_c 
     277@@ -4668,7 +4668,7 @@ static int brcms_b_attach(struct brcms_c 
    278278        brcms_c_coredisable(wlc_hw); 
    279279  
     
    284284        /* turn off pll and xtal to match driver "down" state */ 
    285285        brcms_b_xtal(wlc_hw, OFF); 
    286 @@ -5002,7 +5002,7 @@ static int brcms_b_up_prep(struct brcms_ 
     286@@ -4959,7 +4959,7 @@ static int brcms_b_up_prep(struct brcms_ 
    287287         * Configure pci/pcmcia here instead of in brcms_c_attach() 
    288288         * to allow mfg hotswap:  down, hotswap (chip power cycle), up. 
     
    293293  
    294294        /* 
    295 @@ -5012,12 +5012,12 @@ static int brcms_b_up_prep(struct brcms_ 
     295@@ -4969,12 +4969,12 @@ static int brcms_b_up_prep(struct brcms_ 
    296296         */ 
    297297        if (brcms_b_radio_read_hwdisabled(wlc_hw)) { 
     
    308308        /* reset the d11 core */ 
    309309        brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS); 
    310 @@ -5214,7 +5214,7 @@ static int brcms_b_down_finish(struct br 
     310@@ -5171,7 +5171,7 @@ static int brcms_b_down_finish(struct br 
    311311  
    312312                /* turn off primary xtal and pll */ 
Note: See TracChangeset for help on using the changeset viewer.