Skip to content

Commit

Permalink
[PATCH] bonding: get slave name from actual slave instead of param list
Browse files Browse the repository at this point in the history
Take the primary slave name shown in /proc from the actual slave dev
instead of from the command-line parameter, which won't be present
if the bond is created via sysfs.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Mitch Williams authored and John W. Linville committed Nov 13, 2005
1 parent c61b75a commit 0f418b2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3278,8 +3278,8 @@ static void bond_info_show_master(struct seq_file *seq)

if (USES_PRIMARY(bond->params.mode)) {
seq_printf(seq, "Primary Slave: %s\n",
(bond->params.primary[0]) ?
bond->params.primary : "None");
(bond->primary_slave) ?
bond->primary_slave->dev->name : "None");

seq_printf(seq, "Currently Active Slave: %s\n",
(curr) ? curr->dev->name : "None");
Expand Down

0 comments on commit 0f418b2

Please sign in to comment.