openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bonding: show all the link status of slaves 

There are four link statuses of a bonding slave, the procfs
code shows a wrong status when using downdelay/updelay:

	(slave->link == BOND_LINK_UP) ?  "up" : "down"

It doesn't respect the rest two statuses. This patch fixes it.

Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amerigo Wang 2012-06-14 22:39:27 +00:00 committed by David S. Miller
parent 86a2f415e6
commit df2bcc4af2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/bonding/bond_procfs.c
View File

@ -150,14 +150,25 @@ static void bond_info_show_master(struct seq_file *seq)
} }
} }
static const char *bond_slave_link_status(s8 link)
{
static const char * const status[] = {
[BOND_LINK_UP] = "up",
[BOND_LINK_FAIL] = "going down",
[BOND_LINK_DOWN] = "down",
[BOND_LINK_BACK] = "going back",
};
return status[link];
}
static void bond_info_show_slave(struct seq_file *seq, static void bond_info_show_slave(struct seq_file *seq,
const struct slave *slave) const struct slave *slave)
{ {
struct bonding *bond = seq->private; struct bonding *bond = seq->private;
seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name); seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
seq_printf(seq, "MII Status: %s\n", seq_printf(seq, "MII Status: %s\n", bond_slave_link_status(slave->link));
(slave->link == BOND_LINK_UP) ? "up" : "down");
if (slave->speed == SPEED_UNKNOWN) if (slave->speed == SPEED_UNKNOWN)
seq_printf(seq, "Speed: %s\n", "Unknown"); seq_printf(seq, "Speed: %s\n", "Unknown");
else else