diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-03-21 11:45:50 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-03-21 11:45:50 +0000 |
| commit | ba10454b9115bd876a4c1cbf694d582b87039feb (patch) | |
| tree | 0065877da06e708bc5052463ca349fcb1a436c1d /target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | |
| parent | 782e432797d90904bab73fac9f458ac5ad8de1aa (diff) | |
| download | upstream-ba10454b9115bd876a4c1cbf694d582b87039feb.tar.gz upstream-ba10454b9115bd876a4c1cbf694d582b87039feb.tar.bz2 upstream-ba10454b9115bd876a4c1cbf694d582b87039feb.zip | |
kernel: backport bgmac patches
This allows dropping some hacky bcm53xx bgmac patch forcing link state.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 44917
Diffstat (limited to 'target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch index ef12cac9bf..0a8b451247 100644 --- a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch @@ -4,15 +4,15 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -16,6 +16,7 @@ - #include <linux/phy.h> +@@ -17,6 +17,7 @@ + #include <linux/phy_fixed.h> #include <linux/interrupt.h> #include <linux/dma-mapping.h> +#include <linux/platform_data/b53.h> #include <bcm47xx_nvram.h> static const struct bcma_device_id bgmac_bcma_tbl[] = { -@@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct +@@ -1432,6 +1433,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 **************************************************/ -@@ -1524,6 +1536,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1551,6 +1563,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"); -@@ -1550,6 +1572,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1577,6 +1599,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); |