From patchwork Mon Feb 13 11:23:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 140891 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 5EA83B6FC8 for ; Mon, 13 Feb 2012 22:24:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756213Ab2BMLYD (ORCPT ); Mon, 13 Feb 2012 06:24:03 -0500 Received: from zmc.proxad.net ([212.27.53.206]:36785 "EHLO zmc.proxad.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754763Ab2BMLX6 (ORCPT ); Mon, 13 Feb 2012 06:23:58 -0500 Received: from localhost (localhost [127.0.0.1]) by zmc.proxad.net (Postfix) with ESMTP id 43854465C82; Mon, 13 Feb 2012 12:23:56 +0100 (CET) X-Virus-Scanned: amavisd-new at X-Spam-Flag: NO X-Spam-Score: -4.067 X-Spam-Level: X-Spam-Status: No, score=-4.067 tagged_above=-10 required=2.8 tests=[ALL_TRUSTED=-1.8, AWL=0.332, 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 tYcfYGAjdnoa; 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 C1021465A01; 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 4/5] octeon: fix PHY name to match MDIO bus name Date: Mon, 13 Feb 2012 12:23:23 +0100 Message-Id: <1329132204-27946-5-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 "d6c25be: mdio-octeon: use an unique MDIO bus name" changed the octeon MDIO bus name from "0" to "mdio-octeon-0", change the PHY formatting logic to account for that name change, so that PHY connection on this bus succeeds. CC: stable@vger.kernel.org Signed-off-by: Florian Fainelli --- drivers/net/ethernet/octeon/octeon_mgmt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/octeon/octeon_mgmt.c b/drivers/net/ethernet/octeon/octeon_mgmt.c index 212f43b..cd827ff 100644 --- a/drivers/net/ethernet/octeon/octeon_mgmt.c +++ b/drivers/net/ethernet/octeon/octeon_mgmt.c @@ -670,7 +670,7 @@ static void octeon_mgmt_adjust_link(struct net_device *netdev) static int octeon_mgmt_init_phy(struct net_device *netdev) { struct octeon_mgmt *p = netdev_priv(netdev); - char phy_id[20]; + char phy_id[MII_BUS_ID_SIZE + 3]; if (octeon_is_simulation()) { /* No PHYs in the simulator. */ @@ -678,7 +678,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev) return 0; } - snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "0", p->port); + snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "mdio-octeon-0", p->port); p->phydev = phy_connect(netdev, phy_id, octeon_mgmt_adjust_link, 0, PHY_INTERFACE_MODE_MII);