diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-03-23 13:28:52 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-03-23 13:28:52 +0000 |
commit | f63e9c8fc9de91f581bface237269523d0a31604 (patch) | |
tree | c1899d59eed8ef96621eb0ee0b9daa34a2643245 | |
parent | a7d8a74af5796b150ae4d53cd2808b35dce1099d (diff) | |
download | master-187ad058-f63e9c8fc9de91f581bface237269523d0a31604.tar.gz master-187ad058-f63e9c8fc9de91f581bface237269523d0a31604.tar.bz2 master-187ad058-f63e9c8fc9de91f581bface237269523d0a31604.zip |
generic/3.18: refresh patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44951 3c298f89-4303-0410-b956-a3cf2f4a3e73
5 files changed, 7 insertions, 32 deletions
diff --git a/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch b/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch index ee49e1cc00..121d2f4122 100644 --- a/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch +++ b/target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch @@ -17,11 +17,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/ethernet/broadcom/bgmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c -index ea63cb0..676ffe0 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) +@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ static int bgmac_probe(struct bcma_device *core) { @@ -29,7 +27,7 @@ index ea63cb0..676ffe0 100644 struct net_device *net_dev; struct bgmac *bgmac; struct ssb_sprom *sprom = &core->bus->sprom; -@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) +@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_devic bgmac_chip_reset(bgmac); /* For Northstar, we have to take all GMAC core out of reset */ @@ -40,6 +38,3 @@ index ea63cb0..676ffe0 100644 struct bcma_device *ns_core; int ns_gmac; --- -1.8.4.5 - diff --git a/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch b/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch index fd3e11d672..17fe5dff5e 100644 --- a/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch +++ b/target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch @@ -18,11 +18,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/ethernet/broadcom/bgmac.c | 7 ------- 1 file changed, 7 deletions(-) -diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c -index 676ffe0..0469f72 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -302,9 +302,6 @@ static int bgmac_dma_rx_skb_for_slot(struct bgmac *bgmac, +@@ -302,9 +302,6 @@ static int bgmac_dma_rx_skb_for_slot(str slot->skb = skb; slot->dma_addr = dma_addr; @@ -32,7 +30,7 @@ index 676ffe0..0469f72 100644 return 0; } -@@ -505,8 +502,6 @@ static int bgmac_dma_alloc(struct bgmac *bgmac) +@@ -505,8 +502,6 @@ static int bgmac_dma_alloc(struct bgmac ring->mmio_base); goto err_dma_free; } @@ -41,7 +39,7 @@ index 676ffe0..0469f72 100644 ring->unaligned = bgmac_dma_unaligned(bgmac, ring, BGMAC_DMA_RING_TX); -@@ -536,8 +531,6 @@ static int bgmac_dma_alloc(struct bgmac *bgmac) +@@ -536,8 +531,6 @@ static int bgmac_dma_alloc(struct bgmac err = -ENOMEM; goto err_dma_free; } @@ -50,6 +48,3 @@ index 676ffe0..0469f72 100644 ring->unaligned = bgmac_dma_unaligned(bgmac, ring, BGMAC_DMA_RING_RX); --- -1.8.4.5 - diff --git a/target/linux/generic/patches-3.18/074-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch b/target/linux/generic/patches-3.18/074-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch index 472b22b0e7..9f0baff0ee 100644 --- a/target/linux/generic/patches-3.18/074-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch +++ b/target/linux/generic/patches-3.18/074-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch @@ -17,8 +17,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/ethernet/broadcom/bgmac.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) -diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c -index 0469f72..efda7cf 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -14,6 +14,7 @@ @@ -29,7 +27,7 @@ index 0469f72..efda7cf 100644 #include <linux/interrupt.h> #include <linux/dma-mapping.h> #include <bcm47xx_nvram.h> -@@ -1330,13 +1331,46 @@ static void bgmac_adjust_link(struct net_device *net_dev) +@@ -1330,13 +1331,46 @@ static void bgmac_adjust_link(struct net } } @@ -76,6 +74,3 @@ index 0469f72..efda7cf 100644 mii_bus = mdiobus_alloc(); if (!mii_bus) return -ENOMEM; --- -1.8.4.5 - diff --git a/target/linux/generic/patches-3.18/075-bgmac-allow-enabling-on-ARCH_BCM_5301X.patch b/target/linux/generic/patches-3.18/075-bgmac-allow-enabling-on-ARCH_BCM_5301X.patch index e3352dd99f..4513667e3a 100644 --- a/target/linux/generic/patches-3.18/075-bgmac-allow-enabling-on-ARCH_BCM_5301X.patch +++ b/target/linux/generic/patches-3.18/075-bgmac-allow-enabling-on-ARCH_BCM_5301X.patch @@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net> drivers/net/ethernet/broadcom/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig -index ee4fdfe..a6f9142 100644 --- a/drivers/net/ethernet/broadcom/Kconfig +++ b/drivers/net/ethernet/broadcom/Kconfig @@ -143,7 +143,7 @@ config BNX2X_SRIOV @@ -28,6 +26,3 @@ index ee4fdfe..a6f9142 100644 select PHYLIB ---help--- This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus. --- -1.8.4.5 - diff --git a/target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch b/target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch index f21e6f4b66..283ffce911 100644 --- a/target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch +++ b/target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch @@ -19,11 +19,9 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org> net/ipv6/fib6_rules.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c -index b4d5e1d..27ca796 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c -@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_rule *rule, struct flowi *flp, +@@ -104,6 +104,7 @@ static int fib6_rule_action(struct fib_r goto again; flp6->saddr = saddr; } @@ -31,6 +29,3 @@ index b4d5e1d..27ca796 100644 goto out; } again: --- -2.1.4 - |