diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-19 22:49:17 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-19 22:49:17 +0800 |
| commit | d661f15677f5205c1d272c2db90b60b2d56b25dd (patch) | |
| tree | de3654c1be908381cbe1e46d8ff1afd447851330 /net/core/sock.c | |
| parent | 659a75a439d055cc48086afc2e101ca6ad8343a4 (diff) | |
| parent | 65117109f6344fa46542f85844bc292842116192 (diff) | |
Merge branch 'lsk-v4.1-android' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v4.1-androidlsk-v4.1-17.02-android
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 6633a0cdf864..8875efe3096c 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -732,7 +732,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; @@ -768,7 +768,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: |