Commit 0681a282 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller

bonding: fix u64 division

After the option conversion downdelay and updelay divide a u64
and on a 32 bit this causes the following errors:
ERROR: "__udivdi3" [drivers/net/bonding/bonding.ko] undefined!
ERROR: "__umoddi3" [drivers/net/bonding/bonding.ko] undefined!

Fix it by using a normal int instead because newval->value is capped
at INT_MAX by the way the option is defined.
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 237266f7
...@@ -727,19 +727,21 @@ int bond_option_miimon_set(struct bonding *bond, struct bond_opt_value *newval) ...@@ -727,19 +727,21 @@ int bond_option_miimon_set(struct bonding *bond, struct bond_opt_value *newval)
int bond_option_updelay_set(struct bonding *bond, struct bond_opt_value *newval) int bond_option_updelay_set(struct bonding *bond, struct bond_opt_value *newval)
{ {
int value = newval->value;
if (!bond->params.miimon) { if (!bond->params.miimon) {
pr_err("%s: Unable to set up delay as MII monitoring is disabled\n", pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
bond->dev->name); bond->dev->name);
return -EPERM; return -EPERM;
} }
if ((newval->value % bond->params.miimon) != 0) { if ((value % bond->params.miimon) != 0) {
pr_warn("%s: Warning: up delay (%llu) is not a multiple of miimon (%d), updelay rounded to %llu ms\n", pr_warn("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
bond->dev->name, newval->value, bond->dev->name, value,
bond->params.miimon, bond->params.miimon,
(newval->value / bond->params.miimon) * (value / bond->params.miimon) *
bond->params.miimon); bond->params.miimon);
} }
bond->params.updelay = newval->value / bond->params.miimon; bond->params.updelay = value / bond->params.miimon;
pr_info("%s: Setting up delay to %d.\n", pr_info("%s: Setting up delay to %d.\n",
bond->dev->name, bond->dev->name,
bond->params.updelay * bond->params.miimon); bond->params.updelay * bond->params.miimon);
...@@ -750,19 +752,21 @@ int bond_option_updelay_set(struct bonding *bond, struct bond_opt_value *newval) ...@@ -750,19 +752,21 @@ int bond_option_updelay_set(struct bonding *bond, struct bond_opt_value *newval)
int bond_option_downdelay_set(struct bonding *bond, int bond_option_downdelay_set(struct bonding *bond,
struct bond_opt_value *newval) struct bond_opt_value *newval)
{ {
int value = newval->value;
if (!bond->params.miimon) { if (!bond->params.miimon) {
pr_err("%s: Unable to set down delay as MII monitoring is disabled\n", pr_err("%s: Unable to set down delay as MII monitoring is disabled\n",
bond->dev->name); bond->dev->name);
return -EPERM; return -EPERM;
} }
if ((newval->value % bond->params.miimon) != 0) { if ((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", pr_warn("%s: Warning: down delay (%d) is not a multiple of miimon (%d), delay rounded to %d ms\n",
bond->dev->name, newval->value, bond->dev->name, value,
bond->params.miimon, bond->params.miimon,
(newval->value / bond->params.miimon) * (value / bond->params.miimon) *
bond->params.miimon); bond->params.miimon);
} }
bond->params.downdelay = newval->value / bond->params.miimon; bond->params.downdelay = value / bond->params.miimon;
pr_info("%s: Setting down delay to %d.\n", pr_info("%s: Setting down delay to %d.\n",
bond->dev->name, bond->dev->name,
bond->params.downdelay * bond->params.miimon); bond->params.downdelay * bond->params.miimon);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment