diff options
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 d8c7f8c877ca..9fa46b956bdc 100644 --- a/net/core/sock.c +++ b/net/core/sock.c | |||
@@ -715,7 +715,7 @@ int sock_setsockopt(struct socket *sock, int level, int optname, | |||
715 | val = min_t(u32, val, sysctl_wmem_max); | 715 | val = min_t(u32, val, sysctl_wmem_max); |
716 | set_sndbuf: | 716 | set_sndbuf: |
717 | sk->sk_userlocks |= SOCK_SNDBUF_LOCK; | 717 | sk->sk_userlocks |= SOCK_SNDBUF_LOCK; |
718 | sk->sk_sndbuf = max_t(u32, val * 2, SOCK_MIN_SNDBUF); | 718 | sk->sk_sndbuf = max_t(int, val * 2, SOCK_MIN_SNDBUF); |
719 | /* Wake up sending tasks if we upped the value. */ | 719 | /* Wake up sending tasks if we upped the value. */ |
720 | sk->sk_write_space(sk); | 720 | sk->sk_write_space(sk); |
721 | break; | 721 | break; |
@@ -751,7 +751,7 @@ set_rcvbuf: | |||
751 | * returning the value we actually used in getsockopt | 751 | * returning the value we actually used in getsockopt |
752 | * is the most desirable behavior. | 752 | * is the most desirable behavior. |
753 | */ | 753 | */ |
754 | sk->sk_rcvbuf = max_t(u32, val * 2, SOCK_MIN_RCVBUF); | 754 | sk->sk_rcvbuf = max_t(int, val * 2, SOCK_MIN_RCVBUF); |
755 | break; | 755 | break; |
756 | 756 | ||
757 | case SO_RCVBUFFORCE: | 757 | case SO_RCVBUFFORCE: |