From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4FB5C04A6B for ; Mon, 6 May 2019 14:40:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE2D321019 for ; Mon, 6 May 2019 14:40:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153628; bh=n9KLBnL/pvKdMIVL8hx/z7Yx7bXPZJ9Lx2mfJEqAGz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oct/Z3QN3hdSOijZgZmADgC9rdovzjVqzXna+rIvLUE5GIOZG8BrB4SxMa0QpBNVo /uv8Yn+Eco6plhUcAZ6bQ0Dxm0tdzoR+n4pOILYDazDpgVCL2nSzspLdXpQDUYcmNu m7CnrfXd37S5xPTbnuAOmNtTqZKWTX/gHCejfqSs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727040AbfEFOk1 (ORCPT ); Mon, 6 May 2019 10:40:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:33792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727546AbfEFOk1 (ORCPT ); Mon, 6 May 2019 10:40:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E1D3621530; Mon, 6 May 2019 14:40:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153626; bh=n9KLBnL/pvKdMIVL8hx/z7Yx7bXPZJ9Lx2mfJEqAGz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TC2eFTltRCPkB2CGLrGWvXmGQQeys8gMQ9lEuZhBvg+Bpoe3gAo/mPN302PI6/aih bPSzxuNZatTPmg/xaVS3fZCL94dT/DwnSknoo+OIdjWmu26HaQAECSp3R682svRVFl Ka4tPgfX7CymXSTggmJXNXITvTq/4MZMdWBB/3pc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Konstantin Khorenko , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 37/99] bonding: show full hw address in sysfs for slave entries Date: Mon, 6 May 2019 16:32:10 +0200 Message-Id: <20190506143057.304467958@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143053.899356316@linuxfoundation.org> References: <20190506143053.899356316@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 18bebc6dd3281955240062655a4df35eef2c46b3 ] Bond expects ethernet hwaddr for its slave, but it can be longer than 6 bytes - infiniband interface for example. # cat /sys/devices//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//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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/bonding/bond_sysfs_slave.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); -- 2.20.1