aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2019-06-07 10:59:27 -0400
committerDavid S. Miller <davem@davemloft.net>2019-06-09 13:36:01 -0700
commitf43b6530265a9cd14c39f00b0cc635405f02ae89 (patch)
tree7d9225700cf0761b3df66b60d24b3626f51e7450 /drivers/net/bonding
parentbonding: improve event debug usability (diff)
downloadlinux-dev-f43b6530265a9cd14c39f00b0cc635405f02ae89.tar.xz
linux-dev-f43b6530265a9cd14c39f00b0cc635405f02ae89.zip
bonding: fix error messages in bond_do_fail_over_mac
Passing the bond name again to debug output when referencing slave is wrong. We're trying to set the bond's MAC to that of the new_active slave, so adjust the error message slightly and pass in the slave's name, not the bond's. Then we're trying to set the MAC on the old active slave, but putting the new active slave's name in the output. While we're at it, clarify the error messages so you know which one actually triggered. CC: Jay Vosburgh <j.vosburgh@gmail.com> CC: Veaceslav Falico <vfalico@gmail.com> CC: Andy Gospodarek <andy@greyhouse.net> CC: netdev@vger.kernel.org Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index d575e94a07bf..373805fd40f4 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -661,8 +661,8 @@ static void bond_do_fail_over_mac(struct bonding *bond,
if (new_active) {
rv = bond_set_dev_addr(bond->dev, new_active->dev);
if (rv)
- netdev_err(bond->dev, "Error %d setting MAC of slave %s\n",
- -rv, bond->dev->name);
+ netdev_err(bond->dev, "Error %d setting bond MAC from slave %s\n",
+ -rv, new_active->dev->name);
}
break;
case BOND_FOM_FOLLOW:
@@ -692,7 +692,7 @@ static void bond_do_fail_over_mac(struct bonding *bond,
rv = dev_set_mac_address(new_active->dev,
(struct sockaddr *)&ss, NULL);
if (rv) {
- netdev_err(bond->dev, "Error %d setting MAC of slave %s\n",
+ netdev_err(bond->dev, "Error %d setting MAC of new active slave %s\n",
-rv, new_active->dev->name);
goto out;
}
@@ -707,8 +707,8 @@ static void bond_do_fail_over_mac(struct bonding *bond,
rv = dev_set_mac_address(old_active->dev,
(struct sockaddr *)&ss, NULL);
if (rv)
- netdev_err(bond->dev, "Error %d setting MAC of slave %s\n",
- -rv, new_active->dev->name);
+ netdev_err(bond->dev, "Error %d setting MAC of old active slave %s\n",
+ -rv, old_active->dev->name);
out:
break;
default: