bonding: show full hw address in sysfs for slave entries

finist0 · davem330 · commit 18bebc6dd328 · 2019-03-29T13:32:39.000-07:00
Bond expects ethernet hwaddr for its slave, but it can be longer than 6
bytes - infiniband interface for example.

 # cat /sys/devices/&lt;skipped&gt;/net/ib0/address
 80:00:02:08:fe:80:00:00:00:00:00:00:7c:fe:90:03:00:be:5d:e1

 # cat /sys/devices/&lt;skipped&gt;/net/ib0/bonding_slave/perm_hwaddr
 80:00:02:08:fe:80

So print full hwaddr in sysfs "bonding_slave/perm_hwaddr" as well.

Signed-off-by: Konstantin Khorenko &lt;khorenko@virtuozzo.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/bonding/bond_sysfs_slave.c b/drivers/net/bonding/bond_sysfs_slave.c
@@ -55,7 +55,9 @@ static SLAVE_ATTR_RO(link_failure_count);
 
 static ssize_t perm_hwaddr_show(struct slave *slave, char *buf)
 {
-	return sprintf(buf, "%pM\n", slave->perm_hwaddr);
+	return sprintf(buf, "%*phC\n",
+		       slave->dev->addr_len,
+		       slave->perm_hwaddr);
 }
 static SLAVE_ATTR_RO(perm_hwaddr);
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,9 @@ static SLAVE_ATTR_RO(link_failure_count);`
`55`	`55`
`56`	`56`	`static ssize_t perm_hwaddr_show(struct slave slave, char buf)`
`57`	`57`	`{`
`58`		`- return sprintf(buf, "%pM\n", slave->perm_hwaddr);`
	`58`	`+ return sprintf(buf, "%*phC\n",`
	`59`	`+ slave->dev->addr_len,`
	`60`	`+ slave->perm_hwaddr);`
`59`	`61`	`}`
`60`	`62`	`static SLAVE_ATTR_RO(perm_hwaddr);`
`61`	`63`