Commit 0f418b2a authored Nov 09, 2005 by Mitch Williams Committed by John W. Linville Nov 13, 2005

[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>

parent c61b75ad

drivers/net/bonding/bond_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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");