diff options
author | Chris Zankel <chris@zankel.net> | 2016-01-21 05:16:13 +0000 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2016-01-21 05:16:13 +0000 |
commit | abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937 (patch) | |
tree | e23eae0884d78fba55a41668cf809ae3ecd61159 /crypto/algif_aead.c | |
parent | fbac254eaaaf03131033caa87420f9af2e273907 (diff) | |
parent | 874fbf3b2b51ca47c6a69a8e8ec5e8480c492478 (diff) | |
download | linux-crypto-abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937.tar.gz linux-crypto-abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937.zip |
Merge tag 'v4.4'
Linux 4.4
Diffstat (limited to 'crypto/algif_aead.c')
-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 0aa6fdfb..6d4d4569 100644 --- a/crypto/algif_aead.c +++ b/crypto/algif_aead.c @@ -125,7 +125,7 @@ static int aead_wait_for_data(struct sock *sk, unsigned flags) if (flags & MSG_DONTWAIT) return -EAGAIN; - set_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); + sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk); for (;;) { if (signal_pending(current)) @@ -139,7 +139,7 @@ static int aead_wait_for_data(struct sock *sk, unsigned flags) } finish_wait(sk_sleep(sk), &wait); - clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags); + sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk); return err; } |