These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / llc / llc_conn.c

diff --git a/kernel/net/llc/llc_conn.c b/kernel/net/llc/llc_conn.c
index 81a61fc..3e821da 100644 (file)
--- a/kernel/net/llc/llc_conn.c
+++ b/kernel/net/llc/llc_conn.c
@@ -768,7 +768,7 @@ static struct sock *llc_create_incoming_sock(struct sock *sk,
                                             struct llc_addr *daddr)
 {
        struct sock *newsk = llc_sk_alloc(sock_net(sk), sk->sk_family, GFP_ATOMIC,
-                                         sk->sk_prot);
+                                         sk->sk_prot, 0);
        struct llc_sock *newllc, *llc = llc_sk(sk);
 
        if (!newsk)
@@ -931,9 +931,9 @@ static void llc_sk_init(struct sock *sk)
  *     Allocates a LLC sock and initializes it. Returns the new LLC sock
  *     or %NULL if there's no memory available for one
  */
-struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority, struct proto *prot)
+struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority, struct proto *prot, int kern)
 {
-       struct sock *sk = sk_alloc(net, family, priority, prot);
+       struct sock *sk = sk_alloc(net, family, priority, prot, kern);
 
        if (!sk)
                goto out;