diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2016-08-16 23:24:26 +0200 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2016-08-16 23:32:05 +0200 |
| commit | 6d3fbf28185624506e4b128d2939414309d2a993 (patch) | |
| tree | 9aa9f75fb970314c01f33b6043d5da3e8e895cb2 /target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch | |
| parent | 2803527237c27bc18a0b9260e1dcbce9dfbbaae5 (diff) | |
| download | upstream-6d3fbf28185624506e4b128d2939414309d2a993.tar.gz upstream-6d3fbf28185624506e4b128d2939414309d2a993.tar.bz2 upstream-6d3fbf28185624506e4b128d2939414309d2a993.zip | |
kernel: backport simple bgmac cleanup & fix from Jon
These 2 trivial patches will be followed by a bigger bgmac rework so
they are worth backporting in a separated patch.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch | 10 |
1 files changed, 5 insertions, 5 deletions
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 14986b571a..3892d8ee93 100644 --- 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[] = { -@@ -1680,6 +1681,17 @@ static void bgmac_mii_unregister(struct +@@ -1681,6 +1682,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 **************************************************/ -@@ -1825,6 +1837,14 @@ static int bgmac_probe(struct bcma_devic +@@ -1829,6 +1841,14 @@ static int bgmac_probe(struct bcma_devic net_dev->hw_features = net_dev->features; net_dev->vlan_features = net_dev->features; @@ -44,8 +44,8 @@ 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"); -@@ -1851,6 +1871,10 @@ static void bgmac_remove(struct bcma_dev + dev_err(bgmac->dev, "Cannot register net device\n"); +@@ -1855,6 +1875,10 @@ static void bgmac_remove(struct bcma_dev { 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 -@@ -462,6 +462,9 @@ struct bgmac { +@@ -454,6 +454,9 @@ struct bgmac { bool has_robosw; bool loopback; |