projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bgmac: update bgmac to a version from kernel 3.14-rc1
[openwrt.git]
/
target
/
linux
/
generic
/
patches-3.13
/
773-bgmac-add-srab-switch.patch
diff --git
a/target/linux/generic/patches-3.13/773-bgmac-add-srab-switch.patch
b/target/linux/generic/patches-3.13/773-bgmac-add-srab-switch.patch
index
be25306
..
fe52ccc
100644
(file)
--- a/
target/linux/generic/patches-3.13/773-bgmac-add-srab-switch.patch
+++ b/
target/linux/generic/patches-3.13/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[] = {
#include <bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -14
43,6 +1444
,17 @@ static void bgmac_mii_unregister(struct
+@@ -14
05,6 +1406
,17 @@ static void bgmac_mii_unregister(struct
mdiobus_free(mii_bus);
}
mdiobus_free(mii_bus);
}
@@
-30,7
+30,7
@@
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/**************************************************
* BCMA bus ops
**************************************************/
/**************************************************
* BCMA bus ops
**************************************************/
-@@ -15
61,6 +157
3,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -15
21,6 +153
3,16 @@ static int bgmac_probe(struct bcma_devic
goto err_dma_free;
}
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");
err = register_netdev(bgmac->net_dev);
if (err) {
bgmac_err(bgmac, "Cannot register net device\n");
-@@ -15
90,6 +1612
,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -15
49,6 +1571
,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);
{
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
bgmac_mii_unregister(bgmac);
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -4
30,6 +430
,9 @@ struct bgmac {
+@@ -4
57,6 +457
,9 @@ struct bgmac {
bool has_robosw;
bool loopback;
bool has_robosw;
bool loopback;