CC: upgrade kernel to 3.18.68

[15.05/openwrt.git] / target / linux / generic / patches-3.18 / 078-04-bgmac-reset-enable-Ethernet-core-before-using-it.patch

diff --git a/target/linux/generic/patches-3.18/078-04-bgmac-reset-enable-Ethernet-core-before-using-it.patch b/target/linux/generic/patches-3.18/078-04-bgmac-reset-enable-Ethernet-core-before-using-it.patch
index 8dac985..b3194f0 100644 (file)
--- a/target/linux/generic/patches-3.18/078-04-bgmac-reset-enable-Ethernet-core-before-using-it.patch
+++ b/target/linux/generic/patches-3.18/078-04-bgmac-reset-enable-Ethernet-core-before-using-it.patch
@@ -19,9 +19,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
 
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c

-@@ -1578,6 +1578,11 @@ static int bgmac_probe(struct bcma_devic
-               dev_warn(&core->dev, "Using random MAC: %pM\n", mac);
-       }
+@@ -1583,6 +1583,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.
  
 +      /* This (reset &) enable is not preset in specs or reference driver but
 +       * Broadcom does it in arch PCI code when enabling fake PCI device.