netdev - [PATCH] net: dsa: mv88e6xxx: fix mdio bus name when using devicetree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20170501145404.18581-1-slemieux.tyco@gmail.com>
Date:   Mon,  1 May 2017 10:54:04 -0400
From:   Sylvain Lemieux <slemieux.tyco@...il.com>
To:     andrew@...n.ch, vivien.didelot@...oirfairelinux.com
Cc:     netdev@...r.kernel.org
Subject: [PATCH] net: dsa: mv88e6xxx: fix mdio bus name when using devicetree

From: Liam Beguin <lbeguin@...oint.com>

mv88e6xxx_mdio_register automatically generates mdio buses for each switch
discovered in the devicetree. When switch nodes are embedded in other nodes,
this can cause sysfs naming collisions since full_name may be truncated.

Only use devicetree node name instead of the full devicetree path
as the mdio bus name.

Signed-off-by: Liam Beguin <lbeguin@...oint.com>
Signed-off-by: Alexandre Messier <amessier@...oint.com>
Signed-off-by: Sylvain Lemieux <slemieux@...oint.com>
---
 drivers/net/dsa/mv88e6xxx/chip.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 3354f99df378..80b4387d573e 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2688,8 +2688,8 @@ static int mv88e6xxx_mdio_register(struct mv88e6xxx_chip *chip,
 	mdio_bus->external = external;
 
 	if (np) {
-		bus->name = np->full_name;
-		snprintf(bus->id, MII_BUS_ID_SIZE, "%s", np->full_name);
+		bus->name = np->name;
+		snprintf(bus->id, MII_BUS_ID_SIZE, "%s", np->name);
 	} else {
 		bus->name = "mv88e6xxx SMI";
 		snprintf(bus->id, MII_BUS_ID_SIZE, "mv88e6xxx-%d", index++);
-- 
2.11.0