diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-02 22:24:01 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-10-02 22:24:01 +0000 |
| commit | 06c8b90ebf32eacd45ff196c4c58e51ec7321868 (patch) | |
| tree | 42bddd590a1d6f0a18365932658c37e660cc280b /target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch | |
| parent | 03b0c3b5a6f8c032ba10e1e1193eed1145a996c4 (diff) | |
| download | upstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.tar.gz upstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.tar.bz2 upstream-06c8b90ebf32eacd45ff196c4c58e51ec7321868.zip | |
kernel: bgmac: move bgmac patches already applied in mainline kernel to generic
The bgmac driver will be used on the brcm47xx and the bcm53xx target.
These are only the patches already applied in current net-next/master
branch.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38288
Diffstat (limited to 'target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch b/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch index 195336b716..cb498154a4 100644 --- a/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch +++ b/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch @@ -8,7 +8,7 @@ #ifdef CONFIG_BCM47XX #include <bcm47xx_nvram.h> #else -@@ -1396,6 +1397,17 @@ static void bgmac_mii_unregister(struct +@@ -1424,6 +1425,17 @@ static void bgmac_mii_unregister(struct mdiobus_free(mii_bus); } @@ -26,7 +26,7 @@ /************************************************** * BCMA bus ops **************************************************/ -@@ -1495,6 +1507,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1523,6 +1535,16 @@ static int bgmac_probe(struct bcma_devic goto err_dma_free; } @@ -43,7 +43,7 @@ err = register_netdev(bgmac->net_dev); if (err) { bgmac_err(bgmac, "Cannot register net device\n"); -@@ -1524,6 +1546,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1552,6 +1574,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); @@ -56,7 +56,7 @@ bgmac_mii_unregister(bgmac); --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h -@@ -428,6 +428,9 @@ struct bgmac { +@@ -430,6 +430,9 @@ struct bgmac { bool has_robosw; bool loopback; |