target/linux/mediatek/patches-4.4/0102-net-mediatek-v4.4-backports.patch

   1 From c1ff5519a7fd849da5d169036d8175383f807962 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Mon, 11 Apr 2016 06:00:23 +0200
   4 Subject: [PATCH 102/102] net: mediatek: v4.4 backports
   5
   6 ---
   7  drivers/net/ethernet/mediatek/mtk_eth_soc.c |   13 ++++++++-----
   8  1 file changed, 8 insertions(+), 5 deletions(-)
   9
  10 diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  11 index 7788ba6..22caad3 100644
  12 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  13 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  14 @@ -217,7 +217,7 @@ static int mtk_phy_connect_node(struct mtk_eth *eth, struct mtk_mac *mac,
  15
  16         dev_info(eth->dev,
  17                  "connected mac %d to PHY at %s [uid=%08x, driver=%s]\n",
  18 -                mac->id, phydev_name(phydev), phydev->phy_id,
  19 +                mac->id, dev_name(&phydev->dev), phydev->phy_id,
  20                  phydev->drv->name);
  21
  22         mac->phy_dev = phydev;
  23 @@ -1396,6 +1396,7 @@ static int mtk_stop(struct net_device *dev)
  24         struct mtk_mac *mac = netdev_priv(dev);
  25         struct mtk_eth *eth = mac->hw;
  26
  27 +       netif_carrier_off(dev);
  28         netif_tx_disable(dev);
  29         phy_stop(mac->phy_dev);
  30
  31 @@ -1595,11 +1596,13 @@ static int mtk_set_settings(struct net_device *dev,
  32  {
  33         struct mtk_mac *mac = netdev_priv(dev);
  34
  35 -       if (cmd->phy_address != mac->phy_dev->mdio.addr) {
  36 -               mac->phy_dev = mdiobus_get_phy(mac->hw->mii_bus,
  37 -                                              cmd->phy_address);
  38 -               if (!mac->phy_dev)
  39 +       if (cmd->phy_address != mac->phy_dev->addr) {
  40 +               if (mac->hw->mii_bus->phy_map[cmd->phy_address]) {
  41 +                       mac->phy_dev =
  42 +                               mac->hw->mii_bus->phy_map[cmd->phy_address];
  43 +               } else {
  44                         return -ENODEV;
  45 +               }
  46         }
  47
  48         return phy_ethtool_sset(mac->phy_dev, cmd);
  49 --
  50 1.7.10.4
  51