projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: mv643xx_eth: Add missing phy_addr_set in DT mode
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
marvell
/
mv643xx_eth.c
diff --git
a/drivers/net/ethernet/marvell/mv643xx_eth.c
b/drivers/net/ethernet/marvell/mv643xx_eth.c
index
2c210ec
..
00cd36e
100644
(file)
--- a/
drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/
drivers/net/ethernet/marvell/mv643xx_eth.c
@@
-2513,7
+2513,7
@@
static int mv643xx_eth_shared_of_add_port(struct platform_device *pdev,
mac_addr = of_get_mac_address(pnp);
if (mac_addr)
mac_addr = of_get_mac_address(pnp);
if (mac_addr)
- memcpy(ppd.mac_addr, mac_addr,
6
);
+ memcpy(ppd.mac_addr, mac_addr,
ETH_ALEN
);
mv643xx_eth_property(pnp, "tx-queue-size", ppd.tx_queue_size);
mv643xx_eth_property(pnp, "tx-sram-addr", ppd.tx_sram_addr);
mv643xx_eth_property(pnp, "tx-queue-size", ppd.tx_queue_size);
mv643xx_eth_property(pnp, "tx-sram-addr", ppd.tx_sram_addr);
@@
-2696,7
+2696,7
@@
static void set_params(struct mv643xx_eth_private *mp,
struct net_device *dev = mp->dev;
if (is_valid_ether_addr(pd->mac_addr))
struct net_device *dev = mp->dev;
if (is_valid_ether_addr(pd->mac_addr))
- memcpy(dev->dev_addr, pd->mac_addr,
6
);
+ memcpy(dev->dev_addr, pd->mac_addr,
ETH_ALEN
);
else
uc_addr_get(mp, dev->dev_addr);
else
uc_addr_get(mp, dev->dev_addr);
@@
-2890,6
+2890,7
@@
static int mv643xx_eth_probe(struct platform_device *pdev)
PHY_INTERFACE_MODE_GMII);
if (!mp->phy)
err = -ENODEV;
PHY_INTERFACE_MODE_GMII);
if (!mp->phy)
err = -ENODEV;
+ phy_addr_set(mp, mp->phy->addr);
} else if (pd->phy_addr != MV643XX_ETH_PHY_NONE) {
mp->phy = phy_scan(mp, pd->phy_addr);
} else if (pd->phy_addr != MV643XX_ETH_PHY_NONE) {
mp->phy = phy_scan(mp, pd->phy_addr);