bonding: convert downdelay to use the new option API
This patch adds the necessary changes so downdelay would use the new bonding option API. Also some trivial style fixes. Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
4fb0ef585e
Коммит
25a9b54a4b
|
@ -146,7 +146,8 @@ static int bond_changelink(struct net_device *bond_dev,
|
|||
if (data[IFLA_BOND_DOWNDELAY]) {
|
||||
int downdelay = nla_get_u32(data[IFLA_BOND_DOWNDELAY]);
|
||||
|
||||
err = bond_option_downdelay_set(bond, downdelay);
|
||||
bond_opt_initval(&newval, downdelay);
|
||||
err = __bond_opt_set(bond, BOND_OPT_DOWNDELAY, &newval);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
|
|
|
@ -135,6 +135,13 @@ static struct bond_option bond_opts[] = {
|
|||
.flags = BOND_OPTFLAG_RAWVAL,
|
||||
.set = bond_option_arp_ip_targets_set
|
||||
},
|
||||
[BOND_OPT_DOWNDELAY] = {
|
||||
.id = BOND_OPT_DOWNDELAY,
|
||||
.name = "downdelay",
|
||||
.desc = "Delay before considering link down, in milliseconds",
|
||||
.values = bond_intmax_tbl,
|
||||
.set = bond_option_downdelay_set
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
|
@ -580,31 +587,25 @@ int bond_option_updelay_set(struct bonding *bond, int updelay)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int bond_option_downdelay_set(struct bonding *bond, int downdelay)
|
||||
int bond_option_downdelay_set(struct bonding *bond,
|
||||
struct bond_opt_value *newval)
|
||||
{
|
||||
if (!(bond->params.miimon)) {
|
||||
if (!bond->params.miimon) {
|
||||
pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
|
||||
bond->dev->name);
|
||||
return -EPERM;
|
||||
}
|
||||
|
||||
if (downdelay < 0) {
|
||||
pr_err("%s: Invalid down delay value %d not in range %d-%d; rejected.\n",
|
||||
bond->dev->name, downdelay, 0, INT_MAX);
|
||||
return -EINVAL;
|
||||
} else {
|
||||
if ((downdelay % bond->params.miimon) != 0) {
|
||||
pr_warn("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
|
||||
bond->dev->name, downdelay,
|
||||
bond->params.miimon,
|
||||
(downdelay / bond->params.miimon) *
|
||||
bond->params.miimon);
|
||||
}
|
||||
bond->params.downdelay = downdelay / bond->params.miimon;
|
||||
pr_info("%s: Setting down delay to %d.\n",
|
||||
bond->dev->name,
|
||||
bond->params.downdelay * bond->params.miimon);
|
||||
if ((newval->value % bond->params.miimon) != 0) {
|
||||
pr_warn("%s: Warning: down delay (%llu) is not a multiple of miimon (%d), delay rounded to %llu ms\n",
|
||||
bond->dev->name, newval->value,
|
||||
bond->params.miimon,
|
||||
(newval->value / bond->params.miimon) *
|
||||
bond->params.miimon);
|
||||
}
|
||||
bond->params.downdelay = newval->value / bond->params.miimon;
|
||||
pr_info("%s: Setting down delay to %d.\n",
|
||||
bond->dev->name,
|
||||
bond->params.downdelay * bond->params.miimon);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -46,6 +46,7 @@ enum {
|
|||
BOND_OPT_FAIL_OVER_MAC,
|
||||
BOND_OPT_ARP_INTERVAL,
|
||||
BOND_OPT_ARP_TARGETS,
|
||||
BOND_OPT_DOWNDELAY,
|
||||
BOND_OPT_LAST
|
||||
};
|
||||
|
||||
|
@ -121,4 +122,6 @@ int bond_option_arp_interval_set(struct bonding *bond,
|
|||
int bond_option_arp_ip_targets_set(struct bonding *bond,
|
||||
struct bond_opt_value *newval);
|
||||
void bond_option_arp_ip_targets_clear(struct bonding *bond);
|
||||
int bond_option_downdelay_set(struct bonding *bond,
|
||||
struct bond_opt_value *newval);
|
||||
#endif /* _BOND_OPTIONS_H */
|
||||
|
|
|
@ -501,22 +501,13 @@ static ssize_t bonding_store_downdelay(struct device *d,
|
|||
struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
int new_value, ret;
|
||||
struct bonding *bond = to_bond(d);
|
||||
int ret;
|
||||
|
||||
if (sscanf(buf, "%d", &new_value) != 1) {
|
||||
pr_err("%s: no down delay value specified.\n", bond->dev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!rtnl_trylock())
|
||||
return restart_syscall();
|
||||
|
||||
ret = bond_option_downdelay_set(bond, new_value);
|
||||
ret = bond_opt_tryset_rtnl(bond, BOND_OPT_DOWNDELAY, (char *)buf);
|
||||
if (!ret)
|
||||
ret = count;
|
||||
|
||||
rtnl_unlock();
|
||||
return ret;
|
||||
}
|
||||
static DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR,
|
||||
|
|
|
@ -455,7 +455,6 @@ void bond_netlink_fini(void);
|
|||
int bond_option_active_slave_set(struct bonding *bond, struct net_device *slave_dev);
|
||||
int bond_option_miimon_set(struct bonding *bond, int miimon);
|
||||
int bond_option_updelay_set(struct bonding *bond, int updelay);
|
||||
int bond_option_downdelay_set(struct bonding *bond, int downdelay);
|
||||
int bond_option_use_carrier_set(struct bonding *bond, int use_carrier);
|
||||
int bond_option_arp_ip_target_add(struct bonding *bond, __be32 target);
|
||||
int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target);
|
||||
|
|
Загрузка…
Ссылка в новой задаче