diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-23 07:35:15 +0100 |
| commit | 4ccb6aea4b3eb97c94575d1ed4bf10744169f082 (patch) | |
| tree | a2ca8bc8b567608bd4067593b752f78c895d713b /include/net/sctp/structs.h | |
| parent | f25d384755191690b1196776d319cb6a4e899f28 (diff) | |
| parent | 093b995e3b55a0ae0670226ddfcb05bfbf0099ae (diff) | |
Merge branch 'linus' into x86/asm, to refresh the topic tree with fixes
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); |