diff options
author | Giuseppe CAVALLARO <peppe.cavallaro@st.com> | 2010-01-06 18:07:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-07 20:06:05 -0500 |
commit | 109cdd66485b639b2fbfcbf59ae7ef1286520705 (patch) | |
tree | 91109f8200db4f15d60cd655d0e717aafc3e4844 /drivers/net | |
parent | 596a530bb3af746d33ea2910a0569b9825279979 (diff) |
stmmac: use MII_BUS_ID_SIZE instead of BUS_ID_SIZE
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index 508fba8fa07f..79a938117878 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c | |||
@@ -305,8 +305,8 @@ static int stmmac_init_phy(struct net_device *dev) | |||
305 | { | 305 | { |
306 | struct stmmac_priv *priv = netdev_priv(dev); | 306 | struct stmmac_priv *priv = netdev_priv(dev); |
307 | struct phy_device *phydev; | 307 | struct phy_device *phydev; |
308 | char phy_id[BUS_ID_SIZE]; /* PHY to connect */ | 308 | char phy_id[MII_BUS_ID_SIZE + 3]; |
309 | char bus_id[BUS_ID_SIZE]; | 309 | char bus_id[MII_BUS_ID_SIZE]; |
310 | 310 | ||
311 | priv->oldlink = 0; | 311 | priv->oldlink = 0; |
312 | priv->speed = 0; | 312 | priv->speed = 0; |
@@ -318,7 +318,8 @@ static int stmmac_init_phy(struct net_device *dev) | |||
318 | } | 318 | } |
319 | 319 | ||
320 | snprintf(bus_id, MII_BUS_ID_SIZE, "%x", priv->bus_id); | 320 | snprintf(bus_id, MII_BUS_ID_SIZE, "%x", priv->bus_id); |
321 | snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, bus_id, priv->phy_addr); | 321 | snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id, |
322 | priv->phy_addr); | ||
322 | pr_debug("stmmac_init_phy: trying to attach to %s\n", phy_id); | 323 | pr_debug("stmmac_init_phy: trying to attach to %s\n", phy_id); |
323 | 324 | ||
324 | phydev = phy_connect(dev, phy_id, &stmmac_adjust_link, 0, | 325 | phydev = phy_connect(dev, phy_id, &stmmac_adjust_link, 0, |