diff --git a/[refs] b/[refs]
index 241addfff57f..4cf3a4b8796b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28ad3957b913855e8d41a27f7b90bed944809625
+refs/heads/master: 4fdb78d3093a347456e108b77d56d493d29071b2
diff --git a/trunk/net/ipv4/tcp.c b/trunk/net/ipv4/tcp.c
index 5a15e7629d8e..7bb8479b1eaf 100644
--- a/trunk/net/ipv4/tcp.c
+++ b/trunk/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;