Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
core
/
sock.c
diff --git
a/kernel/net/core/sock.c
b/kernel/net/core/sock.c
index
9c32342
..
03ba648
100644
(file)
--- a/
kernel/net/core/sock.c
+++ b/
kernel/net/core/sock.c
@@
-745,7
+745,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;
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;
/* Wake up sending tasks if we upped the value. */
sk->sk_write_space(sk);
break;
@@
-781,7
+781,7
@@
set_rcvbuf:
* returning the value we actually used in getsockopt
* is the most desirable behavior.
*/
* 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:
break;
case SO_RCVBUFFORCE:
@@
-1562,6
+1562,7
@@
struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
}
newsk->sk_err = 0;
}
newsk->sk_err = 0;
+ newsk->sk_err_soft = 0;
newsk->sk_priority = 0;
newsk->sk_incoming_cpu = raw_smp_processor_id();
atomic64_set(&newsk->sk_cookie, 0);
newsk->sk_priority = 0;
newsk->sk_incoming_cpu = raw_smp_processor_id();
atomic64_set(&newsk->sk_cookie, 0);