Merge tag 'linux-kselftest-4.9-rc1-update' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / net / netfilter / xt_hashlimit.c

diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 44a095e..2fab0c6 100644 (file)
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -467,17 +467,18 @@ static u64 user2credits(u64 user, int revision)
                /* If multiplying would overflow... */
                if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY_v1))
                        /* Divide first. */
-                       return (user / XT_HASHLIMIT_SCALE) *\
-                                               HZ * CREDITS_PER_JIFFY_v1;
+                       return div64_u64(user, XT_HASHLIMIT_SCALE)
+                               * HZ * CREDITS_PER_JIFFY_v1;
 
-               return (user * HZ * CREDITS_PER_JIFFY_v1) \
-                                               / XT_HASHLIMIT_SCALE;
+               return div64_u64(user * HZ * CREDITS_PER_JIFFY_v1,
+                                XT_HASHLIMIT_SCALE);
        } else {
                if (user > 0xFFFFFFFFFFFFFFFF / (HZ*CREDITS_PER_JIFFY))
-                       return (user / XT_HASHLIMIT_SCALE_v2) *\
-                                               HZ * CREDITS_PER_JIFFY;
+                       return div64_u64(user, XT_HASHLIMIT_SCALE_v2)
+                               * HZ * CREDITS_PER_JIFFY;
 
-               return (user * HZ * CREDITS_PER_JIFFY) / XT_HASHLIMIT_SCALE_v2;
+               return div64_u64(user * HZ * CREDITS_PER_JIFFY,
+                                XT_HASHLIMIT_SCALE_v2);
        }
 }