diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2017-03-24 21:58:58 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-03-24 21:58:58 +0800 |
| commit | 2e6d603e5163e6f32a8686744b4d53e8778957ba (patch) | |
| tree | ead238ea5efe7b3f52728793fe9dfa76ca52bc31 /include/crypto | |
| parent | MAINTAINERS: Add maintianer entry for crypto/s5p-sss (diff) | |
| parent | Linux 4.11-rc3 (diff) | |
| download | linux-dev-2e6d603e5163e6f32a8686744b4d53e8778957ba.tar.xz linux-dev-2e6d603e5163e6f32a8686744b4d53e8778957ba.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 4.11-rc3 to pick up md5 removal from /dev/random.
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/if_alg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/crypto/if_alg.h b/include/crypto/if_alg.h index a2bfd7843f18..e2b9c6fe2714 100644 --- a/include/crypto/if_alg.h +++ b/include/crypto/if_alg.h @@ -73,7 +73,7 @@ int af_alg_unregister_type(const struct af_alg_type *type); int af_alg_release(struct socket *sock); void af_alg_release_parent(struct sock *sk); -int af_alg_accept(struct sock *sk, struct socket *newsock); +int af_alg_accept(struct sock *sk, struct socket *newsock, bool kern); int af_alg_make_sg(struct af_alg_sgl *sgl, struct iov_iter *iter, int len); void af_alg_free_sg(struct af_alg_sgl *sgl); |