diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-06-20 22:38:01 +0200 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-06-20 23:07:31 +0200 |
| commit | 65a22d84ad1a921751ac9e5a1a5b52dad6967e16 (patch) | |
| tree | ad4c581f2eefb65070f89320346289f16a169cd7 /target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch | |
| parent | 4bd0edba1ea545954901d4f9e01db60a7d97a7bb (diff) | |
| download | upstream-65a22d84ad1a921751ac9e5a1a5b52dad6967e16.tar.gz upstream-65a22d84ad1a921751ac9e5a1a5b52dad6967e16.tar.bz2 upstream-65a22d84ad1a921751ac9e5a1a5b52dad6967e16.zip | |
kernel: backport bgmac changes from net-next
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
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 | 6 |
1 files changed, 3 insertions, 3 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 8a68e7e401..4348574cbb 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[] = { -@@ -1544,6 +1545,17 @@ static void bgmac_mii_unregister(struct +@@ -1683,6 +1684,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 **************************************************/ -@@ -1688,6 +1700,14 @@ static int bgmac_probe(struct bcma_devic +@@ -1828,6 +1840,14 @@ static int bgmac_probe(struct bcma_devic 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"); -@@ -1714,6 +1734,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1854,6 +1874,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); |