aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-12-26 23:22:31 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-12-26 23:22:31 +0000
commitcbfb4a3594a465308391e132114dabee50bc2e76 (patch)
treebee4d94867e5e543c0dfdd933d746ae5e37ebbd0 /target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
parentdc7849b9c7a517c0793f79c77e94c8104a5478c1 (diff)
downloadmaster-187ad058-cbfb4a3594a465308391e132114dabee50bc2e76.tar.gz
master-187ad058-cbfb4a3594a465308391e132114dabee50bc2e76.tar.bz2
master-187ad058-cbfb4a3594a465308391e132114dabee50bc2e76.zip
kernel: bgmac: update patches
This updates the bgmac backport patch to the current upstream version and adds some more patches mostly for BCM4707. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39165 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch')
-rw-r--r--target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
index be253064b1..a60ba3ce66 100644
--- a/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/patches-3.10/773-bgmac-add-srab-switch.patch
@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -1443,6 +1444,17 @@ static void bgmac_mii_unregister(struct
+@@ -1375,6 +1376,17 @@ static void bgmac_mii_unregister(struct
mdiobus_free(mii_bus);
}
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/**************************************************
* BCMA bus ops
**************************************************/
-@@ -1561,6 +1573,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1490,6 +1502,16 @@ static int bgmac_probe(struct bcma_devic
goto err_dma_free;
}
@@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
err = register_netdev(bgmac->net_dev);
if (err) {
bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1590,6 +1612,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1519,6 +1541,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);
@@ -60,7 +60,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
bgmac_mii_unregister(bgmac);
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -430,6 +430,9 @@ struct bgmac {
+@@ -405,6 +405,9 @@ struct bgmac {
bool has_robosw;
bool loopback;