net-tcp_bbr: v3: change u64 to unsigned long for bytes in bbr_tso_segs_generic

ptpt52 · ptpt52 · commit dcc8b20c0537 · 2024-09-27T10:07:05.000+08:00
This change addresses a build failure on 32-bit systems due to undefined division symbols:

arm:
ERROR: modpost: "__aeabi_uldivmod" [net/ipv4/tcp_bbr.ko] undefined!
ERROR: modpost: "__aeabi_ldivmod" [net/ipv4/tcp_bbr.ko] undefined!

x86, mips, ppc:
ERROR: modpost: "__udivdi3" [net/ipv4/tcp_bbr.ko] undefined!
ERROR: modpost: "__divdi3" [net/ipv4/tcp_bbr.ko] undefined!

Since `sk-&gt;sk_pacing_rate` is already an `unsigned long`, the `bytes` variable is
updated to `unsigned long` to resolve these division issues and ensure compatibility
across both 32-bit and 64-bit platforms.

Signed-off-by: Chen Minqiang &lt;ptpt52@gmail.com&gt;
diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c
@@ -481,7 +481,7 @@ static u32 bbr_tso_segs_generic(struct sock *sk, unsigned int mss_now,
 {
 	struct bbr *bbr = inet_csk_ca(sk);
 	u32 segs, r;
-	u64 bytes;
+	unsigned long bytes;
 
 	/* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */
 	bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift;

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ static u32 bbr_tso_segs_generic(struct sock *sk, unsigned int mss_now,`
`481`	`481`	`{`
`482`	`482`	`struct bbr *bbr = inet_csk_ca(sk);`
`483`	`483`	`u32 segs, r;`
`484`		`- u64 bytes;`
	`484`	`+ unsigned long bytes;`
`485`	`485`
`486`	`486`	`/* Budget a TSO/GSO burst size allowance based on bw (pacing_rate). */`
`487`	`487`	`bytes = sk->sk_pacing_rate >> sk->sk_pacing_shift;`