Changeset 44951


Ignore:
Timestamp:
2015-03-23T14:28:52+01:00 (3 years ago)
Author:
kaloz
Message:

generic/3.18: refresh patches

Signed-off-by: Imre Kaloz <kaloz@…>

Location:
trunk/target/linux/generic/patches-3.18
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch

    r44917 r44951  
    1818 1 file changed, 3 insertions(+), 2 deletions(-) 
    1919 
    20 diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c 
    21 index ea63cb0..676ffe0 100644 
    2220--- a/drivers/net/ethernet/broadcom/bgmac.c 
    2321+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    24 @@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) 
     22@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct 
    2523 /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ 
    2624 static int bgmac_probe(struct bcma_device *core) 
     
    3028        struct bgmac *bgmac; 
    3129        struct ssb_sprom *sprom = &core->bus->sprom; 
    32 @@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) 
     30@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_devic 
    3331        bgmac_chip_reset(bgmac); 
    3432  
     
    4139                int ns_gmac; 
    4240  
    43 --  
    44 1.8.4.5 
    45  
  • trunk/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch

    r44917 r44951  
    1919 1 file changed, 7 deletions(-) 
    2020 
    21 diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c 
    22 index 676ffe0..0469f72 100644 
    2321--- a/drivers/net/ethernet/broadcom/bgmac.c 
    2422+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    25 @@ -302,9 +302,6 @@ static int bgmac_dma_rx_skb_for_slot(struct bgmac *bgmac, 
     23@@ -302,9 +302,6 @@ static int bgmac_dma_rx_skb_for_slot(str 
    2624        slot->skb = skb; 
    2725        slot->dma_addr = dma_addr; 
     
    3331 } 
    3432  
    35 @@ -505,8 +502,6 @@ static int bgmac_dma_alloc(struct bgmac *bgmac) 
     33@@ -505,8 +502,6 @@ static int bgmac_dma_alloc(struct bgmac 
    3634                                  ring->mmio_base); 
    3735                        goto err_dma_free; 
     
    4240                ring->unaligned = bgmac_dma_unaligned(bgmac, ring, 
    4341                                                      BGMAC_DMA_RING_TX); 
    44 @@ -536,8 +531,6 @@ static int bgmac_dma_alloc(struct bgmac *bgmac) 
     42@@ -536,8 +531,6 @@ static int bgmac_dma_alloc(struct bgmac 
    4543                        err = -ENOMEM; 
    4644                        goto err_dma_free; 
     
    5149                ring->unaligned = bgmac_dma_unaligned(bgmac, ring, 
    5250                                                      BGMAC_DMA_RING_RX); 
    53 --  
    54 1.8.4.5 
    55  
  • trunk/target/linux/generic/patches-3.18/074-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch

    r44917 r44951  
    1818 1 file changed, 34 insertions(+) 
    1919 
    20 diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c 
    21 index 0469f72..efda7cf 100644 
    2220--- a/drivers/net/ethernet/broadcom/bgmac.c 
    2321+++ b/drivers/net/ethernet/broadcom/bgmac.c 
     
    3028 #include <linux/dma-mapping.h> 
    3129 #include <bcm47xx_nvram.h> 
    32 @@ -1330,13 +1331,46 @@ static void bgmac_adjust_link(struct net_device *net_dev) 
     30@@ -1330,13 +1331,46 @@ static void bgmac_adjust_link(struct net 
    3331        } 
    3432 } 
     
    7775        if (!mii_bus) 
    7876                return -ENOMEM; 
    79 --  
    80 1.8.4.5 
    81  
  • trunk/target/linux/generic/patches-3.18/075-bgmac-allow-enabling-on-ARCH_BCM_5301X.patch

    r44917 r44951  
    1616 1 file changed, 1 insertion(+), 1 deletion(-) 
    1717 
    18 diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig 
    19 index ee4fdfe..a6f9142 100644 
    2018--- a/drivers/net/ethernet/broadcom/Kconfig 
    2119+++ b/drivers/net/ethernet/broadcom/Kconfig 
     
    2927        ---help--- 
    3028          This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus. 
    31 --  
    32 1.8.4.5 
    33  
  • trunk/target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch

    r44894 r44951  
    2020 1 file changed, 1 insertion(+) 
    2121 
    22 diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c 
    23 index b4d5e1d..27ca796 100644 
    2422--- a/net/ipv6/fib6_rules.c 
    2523+++ b/net/ipv6/fib6_rules.c 
    26 @@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, 
     24@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_r 
    2725                                goto again; 
    2826                        flp6->saddr = saddr; 
     
    3230        } 
    3331 again: 
    34 --  
    35 2.1.4 
    36  
Note: See TracChangeset for help on using the changeset viewer.