diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-04 11:31:12 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-04 11:31:12 +0200 |
| commit | 38bffdac071b720db627bfd2b125a2802a04d419 (patch) | |
| tree | c2e9cf66fa6ff1cc3092079e3eedeb4e6c402227 /net/decnet/af_decnet.c | |
| parent | locking/ww-mutex: Limit stress test to 2 seconds (diff) | |
| parent | sched/fair: Optimize ___update_sched_avg() (diff) | |
| download | linux-38bffdac071b720db627bfd2b125a2802a04d419.tar.xz linux-38bffdac071b720db627bfd2b125a2802a04d419.zip | |
Merge branch 'sched/core' into locking/core
Required for the rtmutex/sched_deadline patches which depend on both
branches
Diffstat (limited to 'net/decnet/af_decnet.c')
| -rw-r--r-- | net/decnet/af_decnet.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index e6e79eda9763..7de5b40a5d0d 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c @@ -1070,7 +1070,8 @@ static struct sk_buff *dn_wait_for_connect(struct sock *sk, long *timeo) return skb == NULL ? ERR_PTR(err) : skb; } -static int dn_accept(struct socket *sock, struct socket *newsock, int flags) +static int dn_accept(struct socket *sock, struct socket *newsock, int flags, + bool kern) { struct sock *sk = sock->sk, *newsk; struct sk_buff *skb = NULL; @@ -1099,7 +1100,7 @@ static int dn_accept(struct socket *sock, struct socket *newsock, int flags) cb = DN_SKB_CB(skb); sk->sk_ack_backlog--; - newsk = dn_alloc_sock(sock_net(sk), newsock, sk->sk_allocation, 0); + newsk = dn_alloc_sock(sock_net(sk), newsock, sk->sk_allocation, kern); if (newsk == NULL) { release_sock(sk); kfree_skb(skb); |