ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 14:13:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

generic/3.18: refresh patches

Browse Source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44951
This commit is contained in:
Imre Kaloz 2015-03-23 13:28:52 +00:00
parent a86b430a85
commit 2375f37723
5 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/generic/patches-3.18/072-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch
View File

@ -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

11
target/linux/generic/patches-3.18/073-bgmac-Clean-warning-messages.patch
View File

@ -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

7
target/linux/generic/patches-3.18/074-bgmac-register-fixed-PHY-for-ARM-BCM470X-BCM5301X-ch.patch
View File

@ -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

5
target/linux/generic/patches-3.18/075-bgmac-allow-enabling-on-ARCH_BCM_5301X.patch
View File

@ -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

7
target/linux/generic/patches-3.18/668-fix-ipv6-throw-routes.patch
View File

@ -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