import PULS_20180308

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index d19cf53dff1651fae5faf063a8520bae7cb73cce..8471951938623f553a86047048b548bc2fdacf79 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -731,7 +731,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
                val = min_t(u32, val, sysctl_wmem_max);
 set_sndbuf:
                sk->sk_userlocks |= SOCK_SNDBUF_LOCK;
-               sk->sk_sndbuf = max_t(u32, val * 2, SOCK_MIN_SNDBUF);
+               sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF);
                /* Wake up sending tasks if we upped the value. */
                sk->sk_write_space(sk);
                break;
@@ -767,7 +767,7 @@ set_rcvbuf:
                 * returning the value we actually used in getsockopt
                 * is the most desirable behavior.
                 */
-               sk->sk_rcvbuf = max_t(u32, val * 2, SOCK_MIN_RCVBUF);
+               sk->sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF);
                break;
 
        case SO_RCVBUFFORCE: