| To: | linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org> |
|---|---|
| Subject: | [PATCH 1/3] bcm63xx: don't use BUS_ID_SIZE in bcm63xx_enet. |
| From: | Maxime Bizon <mbizon@freebox.fr> |
| Date: | Wed, 3 Jun 2009 01:47:35 +0200 |
| Cc: | Florian Fainelli <florian@openwrt.org>, Maxime Bizon <mbizon@freebox.fr> |
| In-reply-to: | <1243986457-27088-1-git-send-email-mbizon@freebox.fr> |
| Original-recipient: | rfc822;linux-mips@linux-mips.org |
| References: | <1243986457-27088-1-git-send-email-mbizon@freebox.fr> |
| Sender: | linux-mips-bounce@linux-mips.org |
Networking recently got rid of BUS_ID_SIZE. Use MII_BUS_ID_SIZE
instead in bcm63xx_enet.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
---
drivers/net/bcm63xx_enet.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 36324b3..af0114a 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -793,7 +793,7 @@ static int bcm_enet_open(struct net_device *dev)
struct phy_device *phydev;
int i, ret;
unsigned int size;
- char phy_id[BUS_ID_SIZE];
+ char phy_id[MII_BUS_ID_SIZE + 3];
void *p;
u32 val;
@@ -802,7 +802,7 @@ static int bcm_enet_open(struct net_device *dev)
if (priv->has_phy) {
/* connect to PHY */
- snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT,
+ snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
priv->mac_id ? "1" : "0", priv->phy_id);
phydev = phy_connect(dev, phy_id, &bcm_enet_adjust_phy_link, 0,
--
1.6.0.4
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [PATCH] hwrng: Add TX4939 RNG driver (v2), Matt Mackall |
|---|---|
| Next by Date: | More updates to bcm63xx, Maxime Bizon |
| Previous by Thread: | More updates to bcm63xx, Maxime Bizon |
| Next by Thread: | [PATCH 3/3] bcm63xx: use NET_IP_ALIGN, Maxime Bizon |
| Indexes: | [Date] [Thread] [Top] [All Lists] |