Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[sfrench/cifs-2.6.git] / include / linux / skmsg.h

diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index f78e90a04a69b733707fb94fcd157d398c46b143..aba0f0f429bec0d1051a370714248f5d0d821776 100644 (file)
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -99,7 +99,8 @@ struct sk_psock {
        void (*saved_close)(struct sock *sk, long timeout);
        void (*saved_write_space)(struct sock *sk);
        void (*saved_data_ready)(struct sock *sk);
-       int  (*psock_update_sk_prot)(struct sock *sk, bool restore);
+       int  (*psock_update_sk_prot)(struct sock *sk, struct sk_psock *psock,
+                                    bool restore);
        struct proto                    *sk_proto;
        struct mutex                    work_mutex;
        struct sk_psock_work_state      work_state;
@@ -403,9 +404,8 @@ static inline void sk_psock_cork_free(struct sk_psock *psock)
 static inline void sk_psock_restore_proto(struct sock *sk,
                                          struct sk_psock *psock)
 {
-       sk->sk_prot->unhash = psock->saved_unhash;
        if (psock->psock_update_sk_prot)
-               psock->psock_update_sk_prot(sk, true);
+               psock->psock_update_sk_prot(sk, psock, true);
 }
 
 static inline void sk_psock_set_state(struct sk_psock *psock,