From patchwork Mon Feb 13 11:23:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 140890 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 B2106B6FC4 for ; Mon, 13 Feb 2012 22:24:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755232Ab2BMLYB (ORCPT ); Mon, 13 Feb 2012 06:24:01 -0500 Received: from zmc.proxad.net ([212.27.53.206]:36784 "EHLO zmc.proxad.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754759Ab2BMLX6 (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 3E6544655EC; Mon, 13 Feb 2012 12:23:56 +0100 (CET) X-Virus-Scanned: amavisd-new at X-Spam-Flag: NO X-Spam-Score: -4.065 X-Spam-Level: X-Spam-Status: No, score=-4.065 tagged_above=-10 required=2.8 tests=[ALL_TRUSTED=-1.8, AWL=0.334, 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 cVZ0HQ1hcH0p; 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 B4EDA465804; 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 3/5] fec: fix PHY name to match fixed MDIO bus name Date: Mon, 13 Feb 2012 12:23:22 +0100 Message-Id: <1329132204-27946-4-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 "391420f7: fec: use an unique MDIO bus name" first modified the MDIO bus name to include the platform name, then in commit "a7ed07d5: net: fec: correct phy_name buffer length when init phy_name" the PHY name formatting was fixed in the case the PHY matches a PHY driver. The FEC driver however, also handles the case where we want to attach to the fixed MDIO bus name, which was previously named "0", and now "fixed-0". Change the PHY formatting logic to account for that. CC: stable@vger.kernel.org Signed-off-by: Florian Fainelli --- drivers/net/ethernet/freescale/fec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index 0ee2ca7..a12b3f5 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c @@ -986,7 +986,7 @@ static int fec_enet_mii_probe(struct net_device *ndev) printk(KERN_INFO "%s: no PHY, assuming direct connection to switch\n", ndev->name); - strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); + strncpy(mdio_bus_id, "fixed-0", MII_BUS_ID_SIZE); phy_id = 0; }