kernel: fold of_get_mac_address_mtd into of_get_mac_address

[openwrt.git] / target / linux / ramips / patches-4.3 / 0600-net-mediatek-add-of_get_mac_address_mtd-support.patch

diff --git a/target/linux/ramips/patches-4.3/0600-net-mediatek-add-of_get_mac_address_mtd-support.patch b/target/linux/ramips/patches-4.3/0600-net-mediatek-add-of_get_mac_address_mtd-support.patch
deleted file mode 100644 (file)
index 38ef418..0000000
--- a/target/linux/ramips/patches-4.3/0600-net-mediatek-add-of_get_mac_address_mtd-support.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fce0d89383e0a2a694723989da608df1a464bae4 Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Sun, 13 Dec 2015 17:45:19 +0100
-Subject: [PATCH 1/2] net: mediatek: add of_get_mac_address_mtd() support
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- drivers/net/ethernet/mediatek/mtk_eth_soc.c |    5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-index fb435fa..9999768 100644
---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -1273,7 +1273,6 @@ static int __init fe_init(struct net_device *dev)
- {
-       struct fe_priv *priv = netdev_priv(dev);
-       struct device_node *port;
--      const char *mac_addr;
-       int err;
- 
-       priv->soc->reset_fe();
-@@ -1281,9 +1280,7 @@ static int __init fe_init(struct net_device *dev)
-       if (priv->soc->switch_init)
-               priv->soc->switch_init(priv);
- 
--      mac_addr = of_get_mac_address(priv->device->of_node);
--      if (mac_addr)
--              ether_addr_copy(dev->dev_addr, mac_addr);
-+      of_get_mac_address_mtd(priv->device->of_node, dev->dev_addr);
- 
-       /*If the mac address is invalid, use random mac address  */
-       if (!is_valid_ether_addr(dev->dev_addr)) {
--- 
-1.7.10.4
-