diff options
| author | Mitch Williams <mitch.a.williams@intel.com> | 2005-11-09 10:35:21 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2005-11-13 14:48:19 -0500 |
| commit | 0f418b2ac49e97b7b763e0473320a201eec15ed3 (patch) | |
| tree | 035d1f855c355371e0b84ea5d22470def2be1a6b /drivers/net/bonding/bond_main.c | |
| parent | c61b75ad03f3a30ef247cac27406f030c10628b0 (diff) | |
| download | kernel_samsung_smdk4412-0f418b2ac49e97b7b763e0473320a201eec15ed3.tar.gz kernel_samsung_smdk4412-0f418b2ac49e97b7b763e0473320a201eec15ed3.tar.bz2 kernel_samsung_smdk4412-0f418b2ac49e97b7b763e0473320a201eec15ed3.zip | |
[PATCH] bonding: get slave name from actual slave instead of param list
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>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9d9f027a9af..3e9b47d9f21 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -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"); |