diff options
author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-09-26 15:54:31 +0200 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2018-09-26 15:54:31 +0200 |
commit | 50d4fb1dc129955ab571c1dd7bf14cd07cc5984d (patch) | |
tree | e7667ecbd53d3985d294ea7ee64e33f9523cedff /crypto/algif_aead.c | |
parent | 4ac44d603f290242cbba2e0d0383460412d55c04 (diff) | |
parent | a41bb691f04fcf6d3fa1f6e743d1520e305bc71d (diff) | |
download | linux-crypto-50d4fb1dc129955ab571c1dd7bf14cd07cc5984d.tar.gz linux-crypto-50d4fb1dc129955ab571c1dd7bf14cd07cc5984d.zip |
Merge tag 'v4.19-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Sync with upstream (which now contains fbdev-v4.19 changes) to
prepare a base for fbdev-v4.20 changes.
Diffstat (limited to '')
-rw-r--r-- | crypto/algif_aead.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/algif_aead.c b/crypto/algif_aead.c index 825524f2..c40a8c7e 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -375,7 +375,7 @@ static struct proto_ops algif_aead_ops = { .sendmsg = aead_sendmsg, .sendpage = af_alg_sendpage, .recvmsg = aead_recvmsg, - .poll_mask = af_alg_poll_mask, + .poll = af_alg_poll, }; static int aead_check_key(struct socket *sock) @@ -471,7 +471,7 @@ static struct proto_ops algif_aead_ops_nokey = { .sendmsg = aead_sendmsg_nokey, .sendpage = aead_sendpage_nokey, .recvmsg = aead_recvmsg_nokey, - .poll_mask = af_alg_poll_mask, + .poll = af_alg_poll, }; static void *aead_bind(const char *name, u32 type, u32 mask) |