korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-18 01:34:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

bonding: fix u64 division

Browse Source 
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: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2014-01-23 23:43:43 +01:00 committed by David S. Miller
parent 237266f76d
commit 0681a28264
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/bonding/bond_options.c
View File

@ -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)
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);