Commit 4fdb78d3 authored Oct 01, 2009 by Andrew Morton Committed by David S. Miller Oct 01, 2009

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>

parent 28ad3957

net/ipv4/tcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;