| Message ID | 20160929173950.GA27689@akamai.com |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
> + return div64_u64((user * HZ * CREDITS_PER_JIFFY_v1), > + XT_HASHLIMIT_SCALE); spurious () > + return div64_u64((user * HZ * CREDITS_PER_JIFFY), > + XT_HASHLIMIT_SCALE_v2); spurious () but: Acked-by: Maciej Żenczykowski -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Sep 29, 2016 at 01:39:50PM -0400, Vishwanath Pai wrote: > v2: > Remove unnecessary div64_u64 around constants > > v3: > remove backslashes > > -- > > Fix link error in 32bit arch because of 64bit division > > Division of 64bit integers will cause linker error undefined reference > to `__udivdi3'. Fix this by replacing divisions with div64_64 Applied, thanks Pai. > Signed-off-by: Vishwanath Pai <vpai@akamai.com> > Fixes: 11d5f15723c9 ("netfilter: xt_hashlimit: Create revision 2 to ...") > > --- Please, next time place the versioning information here, otherwise git am takes the wrong description here. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/30/2016 01:46 PM, Pablo Neira Ayuso wrote: > On Thu, Sep 29, 2016 at 01:39:50PM -0400, Vishwanath Pai wrote: >> v2: >> Remove unnecessary div64_u64 around constants >> >> v3: >> remove backslashes >> >> -- >> >> Fix link error in 32bit arch because of 64bit division >> >> Division of 64bit integers will cause linker error undefined reference >> to `__udivdi3'. Fix this by replacing divisions with div64_64 > > Applied, thanks Pai. > >> Signed-off-by: Vishwanath Pai <vpai@akamai.com> >> Fixes: 11d5f15723c9 ("netfilter: xt_hashlimit: Create revision 2 to ...") >> >> --- > > Please, next time place the versioning information here, otherwise git > am takes the wrong description here. > Thank you. And sorry about, I did not realize git am would put that into the description. -Vishwanath -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c index 44a095e..faf65f1 100644 --- 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); } }
v2: Remove unnecessary div64_u64 around constants v3: remove backslashes -- Fix link error in 32bit arch because of 64bit division Division of 64bit integers will cause linker error undefined reference to `__udivdi3'. Fix this by replacing divisions with div64_64 Signed-off-by: Vishwanath Pai <vpai@akamai.com> Fixes: 11d5f15723c9 ("netfilter: xt_hashlimit: Create revision 2 to ...") --- net/netfilter/xt_hashlimit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)