OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
28ad395
)
net/ipv4/tcp.c: fix min() type mismatch warning
author
Andrew Morton
<akpm@linux-foundation.org>
Thu, 1 Oct 2009 22:02:20 +0000
(15:02 -0700)
committer
David S. Miller
<davem@davemloft.net>
Thu, 1 Oct 2009 22:02:20 +0000
(15:02 -0700)
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>
net/ipv4/tcp.c
patch
|
blob
|
history
diff --git
a/net/ipv4/tcp.c
b/net/ipv4/tcp.c
index
5a15e76
..
7bb8479
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;