Skip to contentSkip to conversation

netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit division

PATCH Superseded Vishwanath Pai 2 participants 2 messages Sep 27, 2016 – Sep 28, 2016

Subsystems (3)
Networking Network drivers netfilter

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Vishwanath Pai

author
#0 lore raw

PATCH v2 1/1 netfilter: xt_hashlimit: Fix link error in 32bit arch because of 64bit division

v2:
Remove unnecessary div64_u64 around constants

--

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 <[email protected]>
---
 net/netfilter/xt_hashlimit.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
net/netfilter/xt_hashlimit.c +6 -5
index 44a095e..200a9d8 100644
@@ -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) *\
+			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) *\
+			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);
 	}
 }
Signature · 1 line
1.9.1
#1 lore raw

I don't think you actually need the backslashes since this ain't in a MACRO definition context.