aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-09-16 16:41:48 -0700
committerStijn Tintel <stijn@linux-ipv6.be>2017-09-18 02:08:18 +0300
commitbb83c9dcca9d7080a704e8a04a58ef37e11681fd (patch)
tree0b6f2bace2bed4b442c6b16fc206458715288257 /target/linux/generic/pending-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch
parent2375e279a7cb462d62fd6028cb3fbd56217222de (diff)
downloadupstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.gz
upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.tar.bz2
upstream-bb83c9dcca9d7080a704e8a04a58ef37e11681fd.zip
kernel: update to 3.18.71
Delete a bunch of fixes that are already included. Refresh patches. Compile-tested on malta/mipsel Runtime-tested on malta/mipsel Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch')
-rw-r--r--target/linux/generic/pending-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch b/target/linux/generic/pending-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch
index ca061a50d1..a4c7876d7f 100644
--- a/target/linux/generic/pending-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch
+++ b/target/linux/generic/pending-3.18/078-bgmac-reset-enable-Ethernet-core-before-using-it.patch
@@ -17,9 +17,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1564,6 +1564,11 @@ static int bgmac_probe(struct bcma_devic
- dev_warn(&core->dev, "Using random MAC: %pM\n", mac);
- }
+@@ -1569,6 +1569,11 @@ static int bgmac_probe(struct bcma_devic
+ */
+ bcma_core_enable(core, 0);
+ /* This (reset &) enable is not preset in specs or reference driver but
+ * Broadcom does it in arch PCI code when enabling fake PCI device.