From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 1 Oct 2009 22:02:20 +0000 (-0700)
Subject: net/ipv4/tcp.c: fix min() type mismatch warning
X-Git-Tag: v2.6.32-rc3~12^2~16
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=4fdb78d3093a347456e108b77d56d493d29071b2;p=net-next-2.6.git

net/ipv4/tcp.c: fix min() type mismatch warning

net/ipv4/tcp.c: In function 'do_tcp_setsockopt':
net/ipv4/tcp.c:2050: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 5a15e7629d8..7bb8479b1ea 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2047,7 +2047,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
 			return -EINVAL;
 
 		val = strncpy_from_user(name, optval,
-					min(TCP_CA_NAME_MAX-1, optlen));
+					min_t(long, TCP_CA_NAME_MAX-1, optlen));
 		if (val < 0)
 			return -EFAULT;
 		name[val] = 0;