Patchwork bonding: fix slave speed reporting in bond_miimon_commit

login
register
mail settings
Submitter Nikolay Aleksandrov
Date June 20, 2013, 12:34 p.m.
Message ID <1371731653-13568-1-git-send-email-nikolay@redhat.com>
Download mbox | patch
Permalink /patch/252893/
State Accepted
Delegated to: David Miller
Headers show

Comments

Nikolay Aleksandrov - June 20, 2013, 12:34 p.m.
From: Nikolay Aleksandrov <nikolay@redhat.com>

When we have BOND_LINK_UP the speed is reported unconditionally with %u
format although it can be SPEED_UNKNOWN (-1). After this patch it returns
0 in that case in an attempt to keep the existing scripts happy.
One line is intenionally left 81 chars because it gets ugly if broken.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
---
If the scripts are not a concern I can re-post with a string "unknown".

 drivers/net/bonding/bond_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Veaceslav Falico - June 20, 2013, 1:42 p.m.
On Thu, Jun 20, 2013 at 02:34:13PM +0200, nikolay@redhat.com wrote:
>From: Nikolay Aleksandrov <nikolay@redhat.com>
>
>When we have BOND_LINK_UP the speed is reported unconditionally with %u
>format although it can be SPEED_UNKNOWN (-1). After this patch it returns
>0 in that case in an attempt to keep the existing scripts happy.
>One line is intenionally left 81 chars because it gets ugly if broken.
>
>Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
>

Acked-by: Veaceslav Falico <vfalico@redhat.com>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - June 24, 2013, 7:05 a.m.
From: Veaceslav Falico <vfalico@redhat.com>
Date: Thu, 20 Jun 2013 15:42:48 +0200

> On Thu, Jun 20, 2013 at 02:34:13PM +0200, nikolay@redhat.com wrote:
>>From: Nikolay Aleksandrov <nikolay@redhat.com>
>>
>>When we have BOND_LINK_UP the speed is reported unconditionally with
>>%u
>>format although it can be SPEED_UNKNOWN (-1). After this patch it
>>returns
>>0 in that case in an attempt to keep the existing scripts happy.
>>One line is intenionally left 81 chars because it gets ugly if broken.
>>
>>Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
>>
> 
> Acked-by: Veaceslav Falico <vfalico@redhat.com>

Applied.

 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 02d9ae7..f975696 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2413,7 +2413,8 @@  static void bond_miimon_commit(struct bonding *bond)
 
 			pr_info("%s: link status definitely up for interface %s, %u Mbps %s duplex.\n",
 				bond->dev->name, slave->dev->name,
-				slave->speed, slave->duplex ? "full" : "half");
+				slave->speed == SPEED_UNKNOWN ? 0 : slave->speed,
+				slave->duplex ? "full" : "half");
 
 			/* notify ad that the link status has changed */
 			if (bond->params.mode == BOND_MODE_8023AD)