Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / wiznet / w5300.c

diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c
index 9d1d986f8d409bf8cc87a43acbeb2270b3b8594a..6e00e3f94ce4e4909d9b624b710f888039f68ded 100644 (file)
--- a/drivers/net/ethernet/wiznet/w5300.c
+++ b/drivers/net/ethernet/wiznet/w5300.c
@@ -490,7 +490,6 @@ static int w5300_set_macaddr(struct net_device *ndev, void *addr)
        if (!is_valid_ether_addr(sock_addr->sa_data))
                return -EADDRNOTAVAIL;
        memcpy(ndev->dev_addr, sock_addr->sa_data, ETH_ALEN);
-       ndev->addr_assign_type &= ~NET_ADDR_RANDOM;
        w5300_write_macaddr(priv);
        return 0;
 }
@@ -667,7 +666,7 @@ static int w5300_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int w5300_suspend(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
@@ -700,7 +699,7 @@ static int w5300_resume(struct device *dev)
        }
        return 0;
 }
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(w5300_pm_ops, w5300_suspend, w5300_resume);