netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <florian@openwrt.org>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Florian Fainelli <florian@openwrt.org>,
	stable@vger.kernel.org
Subject: [PATCH 2/5] bcm63xx-enet: fix PHY name to match MDIO bus name
Date: Mon, 13 Feb 2012 12:23:21 +0100	[thread overview]
Message-ID: <1329132204-27946-3-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1329132204-27946-1-git-send-email-florian@openwrt.org>

Commit 3e617506: bcm63xx_enet: use an unique MDIO bus name introduced
a regression in the PHY connection logic, since the PHY name was formatted
to expect the bus name to be "0" or "1", whereas it is now "bcm63xx-enet-0"
or "bcm63xx-enet-1".

CC: stable@vger.kernel.org
Reported-by: Joel EJC <joel_ejc@yahoofr>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
 drivers/net/ethernet/broadcom/bcm63xx_enet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
index 986019b..c7ca7ec 100644
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -797,7 +797,7 @@ static int bcm_enet_open(struct net_device *dev)
 	if (priv->has_phy) {
 		/* connect to PHY */
 		snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT,
-			 priv->mac_id ? "1" : "0", priv->phy_id);
+			 priv->mii_bus->id, priv->phy_id);
 
 		phydev = phy_connect(dev, phy_id, bcm_enet_adjust_phy_link, 0,
 				     PHY_INTERFACE_MODE_MII);
-- 
1.7.5.4

  parent reply	other threads:[~2012-02-13 11:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-13 11:23 [PATCH 0/5] NET: PHY names vs MDIO bus names regression fixes Florian Fainelli
2012-02-13 11:23 ` [PATCH 1/5] cpmac: fix PHY name to match MDIO bus name Florian Fainelli
2012-02-13 11:23 ` Florian Fainelli [this message]
2012-02-13 11:23 ` [PATCH 3/5] fec: fix PHY name to match fixed " Florian Fainelli
2012-02-13 11:23 ` [PATCH 4/5] octeon: fix PHY name to match " Florian Fainelli
2012-02-13 11:23 ` [PATCH 5/5] ixp4xx-eth: " Florian Fainelli
2012-02-13 21:02 ` [PATCH 0/5] NET: PHY names vs MDIO bus names regression fixes David Miller
2012-02-13 22:00   ` Florian Fainelli
2012-02-13 23:43     ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1329132204-27946-3-git-send-email-florian@openwrt.org \
    --to=florian@openwrt.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).