diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-17 08:55:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-17 08:55:01 +0100 |
| commit | 74c8ce958dbf0b64f198becb5d8aa93afb967438 (patch) | |
| tree | 1744f366cad9c71ae08c2732365e9a3edb4f5e12 /include/net/sctp/structs.h | |
| parent | 45fc8757d1d2128e342b4e7ef39adedf7752faac (diff) | |
| parent | d11507e197242aaab172d7f1d0fe4771fbffa530 (diff) | |
Merge branch 'linus' into x86/mm, to pick up a bugfix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/sctp/structs.h')
| -rw-r--r-- | include/net/sctp/structs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index a244db5e5ff7..07a0b128625a 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -476,7 +476,8 @@ struct sctp_pf { int (*send_verify) (struct sctp_sock *, union sctp_addr *); int (*supported_addrs)(const struct sctp_sock *, __be16 *); struct sock *(*create_accept_sk) (struct sock *sk, - struct sctp_association *asoc); + struct sctp_association *asoc, + bool kern); int (*addr_to_user)(struct sctp_sock *sk, union sctp_addr *addr); void (*to_sk_saddr)(union sctp_addr *, struct sock *sk); void (*to_sk_daddr)(union sctp_addr *, struct sock *sk); |