projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update bgmac by adding Florian's upstream changes
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
patches-4.4
/
773-bgmac-add-srab-switch.patch
diff --git
a/target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch
b/target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch
index 29bbf1ae7bb5a1235caecbe1e02fa6cefe7aa7db..14986b571a1871189fe1d1d45d02fc7fd7eb813e 100644
(file)
--- a/
target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch
+++ b/
target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch
@@
-12,7
+12,7
@@
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <linux/bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
#include <linux/bcm47xx_nvram.h>
static const struct bcma_device_id bgmac_bcma_tbl[] = {
-@@ -1
545,6 +1546
,17 @@ static void bgmac_mii_unregister(struct
+@@ -1
680,6 +1681
,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
**************************************************/
-@@ -1
687,6 +1699
,14 @@ static int bgmac_probe(struct bcma_devic
+@@ -1
825,6 +1837
,14 @@ static int bgmac_probe(struct bcma_devic
net_dev->hw_features = net_dev->features;
net_dev->vlan_features = net_dev->features;
net_dev->hw_features = net_dev->features;
net_dev->vlan_features = net_dev->features;
@@
-45,7
+45,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
713,6 +1733
,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1
851,6 +1871
,10 @@ static void bgmac_remove(struct bcma_dev
{
struct bgmac *bgmac = bcma_get_drvdata(core);
{
struct bgmac *bgmac = bcma_get_drvdata(core);
@@
-58,7
+58,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
-@@ -46
3,6 +463
,9 @@ struct bgmac {
+@@ -46
2,6 +462
,9 @@ struct bgmac {
bool has_robosw;
bool loopback;
bool has_robosw;
bool loopback;