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