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 <[EMAIL PROTECTED]>


diff -urpN -X dontdiff linux-2.6.14-release/drivers/net/bonding/bond_main.c 
linux-2.6.14/drivers/net/bonding/bond_main.c
--- linux-2.6.14-release/drivers/net/bonding/bond_main.c        2005-11-08 
11:15:43.000000000 -0800
+++ linux-2.6.14/drivers/net/bonding/bond_main.c        2005-11-08 
11:15:52.000000000 -0800
@@ -3286,8 +3286,8 @@ static void bond_info_show_master(struct

        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");
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to