[PATCH] 2.4.11 min() in tcp.c

[PATCH] 2.4.11 min() in tcp.c

[Chris Wright]

compiling 2.4.11 gives the following warning.

tcp.c:855: warning: comparison of distinct pointer types lacks a cast

the following patch, changes min() to min_t() to make size_t explicit.

thanks,
-chris

--- linux-2.4.11/net/ipv4/tcp.c	Mon Oct  1 09:19:57 2001
+++ linux-2.4.11-min/net/ipv4/tcp.c	Wed Oct 10 16:42:55 2001
@@ -852,7 +852,7 @@
 
 		page = pages[poffset/PAGE_SIZE];
 		offset = poffset % PAGE_SIZE;
-		size = min(psize, PAGE_SIZE-offset);
+		size = min_t (size_t, psize, PAGE_SIZE-offset);
 
 		if (tp->send_head==NULL || (copy = mss_now - skb->len) <= 0) {
 new_segment:

Re: [PATCH] 2.4.11 min() in tcp.c

[David S. Miller]

   From: Chris Wright <chris@wirex.com>
   Date: Wed, 10 Oct 2001 16:44:30 -0700

   tcp.c:855: warning: comparison of distinct pointer types lacks a cast
   
   the following patch, changes min() to min_t() to make size_t explicit.

Applied, but with a cleanup, please never do this:
   
   -		min(
   +		min_t (

"min_t" is not a C operator, therefore no reason to put a space
between "min_t" and the openning parenthesis.  If you look around,
this is the general coding style rule the Linux code follows:

	if ()  /* <--- space here */
	while () /* <--- and here */
	foo_function() /* <--- but not here */

For example.

Franks a lot,
David S. Miller
davem@redhat.com

Re: [PATCH] 2.4.11 min() in tcp.c

[Chris Wright]

* David S. Miller (davem@redhat.com) wrote:
> 
> Applied, but with a cleanup, please never do this:
>    
>    -		min(
>    +		min_t (

yes, my mistake. thanks.
-chris