diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 17:32:33 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-13 17:32:33 +0000 |
commit | 1bf8e555bb3466baf775113ab27aa8f05f0e6aa7 (patch) | |
tree | 741d4683dc45fdeba55701fe6b1d03186a5eacd0 /target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | |
parent | 24e9f521068575a0670028f21fe0323461f80bf1 (diff) | |
download | mtk-20170518-1bf8e555bb3466baf775113ab27aa8f05f0e6aa7.zip mtk-20170518-1bf8e555bb3466baf775113ab27aa8f05f0e6aa7.tar.gz mtk-20170518-1bf8e555bb3466baf775113ab27aa8f05f0e6aa7.tar.bz2 |
kernel: sync bgmac changes with latest upstream submission
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 45420
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 | 6 |
1 files changed, 3 insertions, 3 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 a18be96..14c6407 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 @@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> #include <bcm47xx_nvram.h> static const struct bcma_device_id bgmac_bcma_tbl[] = { -@@ -1524,6 +1525,17 @@ static void bgmac_mii_unregister(struct +@@ -1519,6 +1520,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 **************************************************/ -@@ -1650,6 +1662,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1645,6 +1657,16 @@ static int bgmac_probe(struct bcma_devic net_dev->hw_features = net_dev->features; net_dev->vlan_features = net_dev->features; @@ -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"); -@@ -1676,6 +1698,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1671,6 +1693,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); |