From patchwork Mon Feb 13 11:23:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 140893 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C1B2CB6FBA for ; Mon, 13 Feb 2012 22:24:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754985Ab2BMLX7 (ORCPT ); Mon, 13 Feb 2012 06:23:59 -0500 Received: from zmc.proxad.net ([212.27.53.206]:36775 "EHLO zmc.proxad.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754357Ab2BMLX5 (ORCPT ); Mon, 13 Feb 2012 06:23:57 -0500 Received: from localhost (localhost [127.0.0.1]) by zmc.proxad.net (Postfix) with ESMTP id 635AE46541F; Mon, 13 Feb 2012 12:23:56 +0100 (CET) X-Virus-Scanned: amavisd-new at X-Spam-Flag: NO X-Spam-Score: -4.066 X-Spam-Level: X-Spam-Status: No, score=-4.066 tagged_above=-10 required=2.8 tests=[ALL_TRUSTED=-1.8, AWL=0.333, BAYES_00=-2.599] autolearn=ham Received: from zmc.proxad.net ([127.0.0.1]) by localhost (zmc.proxad.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ALaQZtOAag6D; Mon, 13 Feb 2012 12:23:55 +0100 (CET) Received: from flexo.iliad.local (freebox.vlq16.iliad.fr [213.36.7.13]) by zmc.proxad.net (Postfix) with ESMTPSA id A8AF7465812; Mon, 13 Feb 2012 12:23:55 +0100 (CET) From: Florian Fainelli To: davem@davemloft.net Cc: netdev@vger.kernel.org, Florian Fainelli , 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 Message-Id: <1329132204-27946-3-git-send-email-florian@openwrt.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1329132204-27946-1-git-send-email-florian@openwrt.org> References: <1329132204-27946-1-git-send-email-florian@openwrt.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.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 Signed-off-by: Florian Fainelli --- 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);