diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-05-08 16:48:45 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-05-08 16:48:48 +0300 |
| commit | d09fc0c4bdfbcbe251df247b5a94e2a07dec9c2f (patch) | |
| tree | 893d98100d3ede2ff76905a67e1b9798c8c88868 /drivers/net/bonding | |
| parent | 76cc3bd0c342199b0bc0fd6afc7035274bf7a718 (diff) | |
| parent | 274ede3e1a5fb3d0fd33acafb08993e95972c51f (diff) | |
| download | linux-dev-5.0.tar.xz | |
Merge tag 'v5.0.14' into dev-5.0dev-5.0
This is the 5.0.14 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_sysfs_slave.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_sysfs_slave.c b/drivers/net/bonding/bond_sysfs_slave.c index 2f120b2ffef0..4985268e2273 100644 --- 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); |