Commit 1b203c13 authored Oct 06, 2016 by Geert Uytterhoeven Committed by Pablo Neira Ayuso Oct 17, 2016

netfilter: xt_hashlimit: Add missing ULL suffixes for 64-bit constants



On 32-bit (e.g. with m68k-linux-gnu-gcc-4.1):

    net/netfilter/xt_hashlimit.c: In function ‘user2credits’:
    net/netfilter/xt_hashlimit.c:476: warning: integer constant is too large for ‘long’ type
    ...
    net/netfilter/xt_hashlimit.c:478: warning: integer constant is too large for ‘long’ type
    ...
    net/netfilter/xt_hashlimit.c:480: warning: integer constant is too large for ‘long’ type
    ...

    net/netfilter/xt_hashlimit.c: In function ‘rateinfo_recalc’:
    net/netfilter/xt_hashlimit.c:513: warning: integer constant is too large for ‘long’ type

Fixes: 11d5f157 ("netfilter: xt_hashlimit: Create revision 2 to support higher pps rates")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Vishwanath Pai <vpai@akamai.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 6d3a4c40

net/netfilter/xt_hashlimit.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -431,7 +431,7 @@ static void htable_put(struct xt_hashlimit_htable *hinfo)
		CREDITS_PER_JIFFYHZ606024 < 2^32 ie.
		*/
		#define MAX_CPJ_v1 (0xFFFFFFFF / (HZ6060*24))
		#define MAX_CPJ (0xFFFFFFFFFFFFFFFF / (HZ6060*24))
		#define MAX_CPJ (0xFFFFFFFFFFFFFFFFULL / (HZ6060*24))

		/* Repeated shift and or gives us all 1s, final shift and add 1 gives
		* us the power of 2 below the theoretical max, so GCC simply does a
		@@ -473,7 +473,7 @@ static u64 user2credits(u64 user, int revision)
		return div64_u64(user * HZ * CREDITS_PER_JIFFY_v1,
		XT_HASHLIMIT_SCALE);
		} else {
		if (user > 0xFFFFFFFFFFFFFFFF / (HZ*CREDITS_PER_JIFFY))
		if (user > 0xFFFFFFFFFFFFFFFFULL / (HZ*CREDITS_PER_JIFFY))
		return div64_u64(user, XT_HASHLIMIT_SCALE_v2)
		* HZ * CREDITS_PER_JIFFY;

Admin message