projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generic/4.0: update to 4.0.1
[openwrt.git]
/
target
/
linux
/
generic
/
patches-4.0
/
773-bgmac-add-srab-switch.patch
diff --git
a/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch
b/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch
index
0a8b451
..
b883d73
100644
(file)
--- a/
target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch
+++ b/
target/linux/generic/patches-4.0/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[] = {
-@@ -1
432,6 +1433
,17 @@ static void bgmac_mii_unregister(struct
+@@ -1
538,6 +1539
,17 @@ static void bgmac_mii_unregister(struct
mdiobus_free(mii_bus);
}
mdiobus_free(mii_bus);
}
@@
-30,9
+30,9
@@
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/**************************************************
* BCMA bus ops
**************************************************/
/**************************************************
* BCMA bus ops
**************************************************/
-@@ -1
551,6 +1563
,16 @@ static int bgmac_probe(struct bcma_devic
-
goto err_dma_free
;
- }
+@@ -1
664,6 +1676
,16 @@ static int bgmac_probe(struct bcma_devic
+
net_dev->hw_features = net_dev->features
;
+ net_dev->vlan_features = net_dev->features;
+ if ((ci->id == BCMA_CHIP_ID_BCM4707 ||
+ ci->id == BCMA_CHIP_ID_BCM53018) &&
+ if ((ci->id == BCMA_CHIP_ID_BCM4707 ||
+ ci->id == BCMA_CHIP_ID_BCM53018) &&
@@
-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");
-@@ -1
577,6 +1599
,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1
690,6 +1712
,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>
netif_napi_del(&bgmac->napi);
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
netif_napi_del(&bgmac->napi);
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -4
57,6 +457
,9 @@ struct bgmac {
+@@ -4
62,6 +462
,9 @@ struct bgmac {
bool has_robosw;
bool loopback;
bool has_robosw;
bool loopback;