projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "usb: ehci-platform: support no relinquishing port quirk"
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
algif_aead.c
diff --git
a/crypto/algif_aead.c
b/crypto/algif_aead.c
index 0aa6fdfb448a8c4081e06aa9dcb041433dc280a5..6d4d4569447ee080ef44eb7c8c17d782bec23103 100644
(file)
--- 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;
if (flags & MSG_DONTWAIT)
return -EAGAIN;
- s
et_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags
);
+ s
k_set_bit(SOCKWQ_ASYNC_WAITDATA, sk
);
for (;;) {
if (signal_pending(current))
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);
}
finish_wait(sk_sleep(sk), &wait);
-
clear_bit(SOCK_ASYNC_WAITDATA, &sk->sk_socket->flags
);
+
sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk
);
return err;
}
return err;
}