projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
net/ipv4/tcp.c: fix min() type mismatch warning
[linux-2.6-block.git]
/
net
/
ipv4
/
tcp.c
diff --git
a/net/ipv4/tcp.c
b/net/ipv4/tcp.c
index 5a15e7629d8e67ade64534900775556f47f71d91..7bb8479b1eaf8ab8309916d0fde610031b49c6cb 100644
(file)
--- 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;