openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bonding: fix disabling of arp_interval and miimon 

Currently if either arp_interval or miimon is disabled, they both get
disabled, and upon disabling they get executed once more which is not
the proper behaviour. Also when doing a no-op and disabling an already
disabled one, the other again gets disabled.
Also fix the error messages with the proper valid ranges, and a small
typo fix in the up delay error message (outputting "down delay", instead
of "up delay").

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
nikolay@redhat.com 2013-03-27 03:32:41 +00:00 committed by David S. Miller
parent 1c4a154e52
commit 1bc7db1678
1 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
drivers/net/bonding/bond_sysfs.c
View File

@ -527,7 +527,7 @@ static ssize_t bonding_store_arp_interval(struct device *d,
goto out; goto out;
} }
if (new_value < 0) { if (new_value < 0) {
pr_err("%s: Invalid arp_interval value %d not in range 1-%d; rejected.\n", pr_err("%s: Invalid arp_interval value %d not in range 0-%d; rejected.\n",
bond->dev->name, new_value, INT_MAX); bond->dev->name, new_value, INT_MAX);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
@ -542,14 +542,15 @@ static ssize_t bonding_store_arp_interval(struct device *d,
pr_info("%s: Setting ARP monitoring interval to %d.\n", pr_info("%s: Setting ARP monitoring interval to %d.\n",
bond->dev->name, new_value); bond->dev->name, new_value);
bond->params.arp_interval = new_value; bond->params.arp_interval = new_value;
if (bond->params.miimon) { if (new_value) {
pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n", if (bond->params.miimon) {
bond->dev->name, bond->dev->name); pr_info("%s: ARP monitoring cannot be used with MII monitoring. %s Disabling MII monitoring.\n",
bond->params.miimon = 0; bond->dev->name, bond->dev->name);
} bond->params.miimon = 0;
if (!bond->params.arp_targets[0]) { }
pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified.\n", if (!bond->params.arp_targets[0])
bond->dev->name); pr_info("%s: ARP monitoring has been set up, but no ARP targets have been specified.\n",
bond->dev->name);
} }
if (bond->dev->flags & IFF_UP) { if (bond->dev->flags & IFF_UP) {
/* If the interface is up, we may need to fire off /* If the interface is up, we may need to fire off
@ -557,10 +558,13 @@ static ssize_t bonding_store_arp_interval(struct device *d,
* timer will get fired off when the open function * timer will get fired off when the open function
* is called. * is called.
*/ */
cancel_delayed_work_sync(&bond->mii_work); if (!new_value) {
queue_delayed_work(bond->wq, &bond->arp_work, 0); cancel_delayed_work_sync(&bond->arp_work);
} else {
cancel_delayed_work_sync(&bond->mii_work);
queue_delayed_work(bond->wq, &bond->arp_work, 0);
}
} }
out: out:
rtnl_unlock(); rtnl_unlock();
return ret; return ret;
@ -702,7 +706,7 @@ static ssize_t bonding_store_downdelay(struct device *d,
} }
if (new_value < 0) { if (new_value < 0) {
pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n", pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
bond->dev->name, new_value, 1, INT_MAX); bond->dev->name, new_value, 0, INT_MAX);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} else { } else {
@ -757,8 +761,8 @@ static ssize_t bonding_store_updelay(struct device *d,
goto out; goto out;
} }
if (new_value < 0) { if (new_value < 0) {
pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n", pr_err("%s: Invalid up delay value %d not in range %d-%d; rejected.\n",
bond->dev->name, new_value, 1, INT_MAX); bond->dev->name, new_value, 0, INT_MAX);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} else { } else {
@ -968,37 +972,37 @@ static ssize_t bonding_store_miimon(struct device *d,
} }
if (new_value < 0) { if (new_value < 0) {
pr_err("%s: Invalid miimon value %d not in range %d-%d; rejected.\n", pr_err("%s: Invalid miimon value %d not in range %d-%d; rejected.\n",
bond->dev->name, new_value, 1, INT_MAX); bond->dev->name, new_value, 0, INT_MAX);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} else { }
pr_info("%s: Setting MII monitoring interval to %d.\n", pr_info("%s: Setting MII monitoring interval to %d.\n",
bond->dev->name, new_value); bond->dev->name, new_value);
bond->params.miimon = new_value; bond->params.miimon = new_value;
if (bond->params.updelay) if (bond->params.updelay)
pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value.\n", pr_info("%s: Note: Updating updelay (to %d) since it is a multiple of the miimon value.\n",
bond->dev->name, bond->dev->name,
bond->params.updelay * bond->params.miimon); bond->params.updelay * bond->params.miimon);
if (bond->params.downdelay) if (bond->params.downdelay)
pr_info("%s: Note: Updating downdelay (to %d) since it is a multiple of the miimon value.\n", pr_info("%s: Note: Updating downdelay (to %d) since it is a multiple of the miimon value.\n",
bond->dev->name, bond->dev->name,
bond->params.downdelay * bond->params.miimon); bond->params.downdelay * bond->params.miimon);
if (bond->params.arp_interval) { if (new_value && bond->params.arp_interval) {
pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n", pr_info("%s: MII monitoring cannot be used with ARP monitoring. Disabling ARP monitoring...\n",
bond->dev->name); bond->dev->name);
bond->params.arp_interval = 0; bond->params.arp_interval = 0;
if (bond->params.arp_validate) { if (bond->params.arp_validate)
bond->params.arp_validate = bond->params.arp_validate = BOND_ARP_VALIDATE_NONE;
BOND_ARP_VALIDATE_NONE; }
} if (bond->dev->flags & IFF_UP) {
} /* If the interface is up, we may need to fire off
* the MII timer. If the interface is down, the
if (bond->dev->flags & IFF_UP) { * timer will get fired off when the open function
/* If the interface is up, we may need to fire off * is called.
* the MII timer. If the interface is down, the */
* timer will get fired off when the open function if (!new_value) {
* is called. cancel_delayed_work_sync(&bond->mii_work);
*/ } else {
cancel_delayed_work_sync(&bond->arp_work); cancel_delayed_work_sync(&bond->arp_work);
queue_delayed_work(bond->wq, &bond->mii_work, 0); queue_delayed_work(bond->wq, &bond->mii_work, 0);
} }