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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 99E11C04E53 for ; Wed, 15 May 2019 10:59:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C22F20881 for ; Wed, 15 May 2019 10:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557917962; bh=w3BV+k1uizd45hFPlEb6uBJvBBqknqvC89YUx9rsraw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gRJ/uFtzvJTlxmN3jFqvL1uQQHrpOdjEnkQYSvy+cPeX7Q3xAgjGs0IEuZ3Zc15Z0 vHVPbCW2tLLNae/pgkXJm4fzUnui/0f1rikDmJPn5wh7K2sH48qEBgjoLW4O0VCeVm r7HkaLT0c1Z7csUI1X8POxrlqnE2K8lMM80yhdbU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727130AbfEOK7V (ORCPT ); Wed, 15 May 2019 06:59:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:55846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727127AbfEOK7U (ORCPT ); Wed, 15 May 2019 06:59:20 -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 87BD82084F; Wed, 15 May 2019 10:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557917960; bh=w3BV+k1uizd45hFPlEb6uBJvBBqknqvC89YUx9rsraw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VWfDMAAK3YoB5cCpPyhN9cYK6NK+IZ6lzg5ywCxXdAO93uZHz/uG5Ei/oLR0s9Yyt amVily6Nl8h2HiU3k1queZpEEkwWhu6Cr1CukRzvNhy+4D+tIyMseL3P2vmhrLMgsZ KF5QSlHvy4E6hRw08/ovbZYqeb7VdZv19ONnb5tA= 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 3.18 40/86] bonding: show full hw address in sysfs for slave entries Date: Wed, 15 May 2019 12:55:17 +0200 Message-Id: <20190515090650.541157042@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090642.339346723@linuxfoundation.org> References: <20190515090642.339346723@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 b01b0ce4d1be..cf9e9a3d4a48 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