From patchwork Thu Apr 20 09:06:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 752726 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3w7tKS5VhQz9s7B for ; Thu, 20 Apr 2017 19:06:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S943912AbdDTJGu (ORCPT ); Thu, 20 Apr 2017 05:06:50 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:41634 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S943690AbdDTJGs (ORCPT ); Thu, 20 Apr 2017 05:06:48 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v3K96iC4014301 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 20 Apr 2017 09:06:45 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v3K96iP5014449 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 20 Apr 2017 09:06:44 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v3K96hW1005650; Thu, 20 Apr 2017 09:06:43 GMT Received: from redman.cn.oracle.com (/10.113.194.127) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 20 Apr 2017 02:06:43 -0700 From: Zhu Yanjun To: j.vosburgh@gmail.com, vfalico@gmail.com, andy@greyhouse.net, netdev@vger.kernel.org Subject: [PATCH 1/1] bonding: use 'M' or 'G' based on the speed Date: Thu, 20 Apr 2017 05:06:35 -0400 Message-Id: <1492679195-19938-1-git-send-email-yanjun.zhu@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If the speed of the slave netdev is more than 1000M, it is better to use 'G' instead of 'M'. Signed-off-by: Zhu Yanjun --- drivers/net/bonding/bond_main.c | 8 ++++++-- drivers/net/bonding/bond_procfs.c | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index af9f0ce..1aad13d 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2147,9 +2147,13 @@ static void bond_miimon_commit(struct bonding *bond) bond_set_backup_slave(slave); } - netdev_info(bond->dev, "link status definitely up for interface %s, %u Mbps %s duplex\n", + netdev_info(bond->dev, "link status definitely up for interface %s, %u%sbps %s duplex\n", slave->dev->name, - slave->speed == SPEED_UNKNOWN ? 0 : slave->speed, + slave->speed == SPEED_UNKNOWN ? 0 : + (slave->speed > 1000 ? + slave->speed / 1000 : slave->speed), + slave->speed > 1000 ? + slave->speed % 1000 ? ".5 G" : " G" : " M", slave->duplex ? "full" : "half"); /* notify ad that the link status has changed */ diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c index f514fe5..4c31055 100644 --- a/drivers/net/bonding/bond_procfs.c +++ b/drivers/net/bonding/bond_procfs.c @@ -173,7 +173,11 @@ static void bond_info_show_slave(struct seq_file *seq, if (slave->speed == SPEED_UNKNOWN) seq_printf(seq, "Speed: %s\n", "Unknown"); else - seq_printf(seq, "Speed: %d Mbps\n", slave->speed); + seq_printf(seq, "Speed: %d%sbps\n", + slave->speed > 1000 ? + slave->speed / 1000 : slave->speed, + slave->speed > 1000 ? + (slave->speed % 1000 ? ".5 G" : " G") : " M"); if (slave->duplex == DUPLEX_UNKNOWN) seq_printf(seq, "Duplex: %s\n", "Unknown");