|
@@ -1488,14 +1488,11 @@ static inline __poll_t iucv_accept_poll(struct sock *parent)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
-__poll_t iucv_sock_poll(struct file *file, struct socket *sock,
|
|
|
|
- poll_table *wait)
|
|
|
|
|
|
+static __poll_t iucv_sock_poll_mask(struct socket *sock, __poll_t events)
|
|
{
|
|
{
|
|
struct sock *sk = sock->sk;
|
|
struct sock *sk = sock->sk;
|
|
__poll_t mask = 0;
|
|
__poll_t mask = 0;
|
|
|
|
|
|
- sock_poll_wait(file, sk_sleep(sk), wait);
|
|
|
|
-
|
|
|
|
if (sk->sk_state == IUCV_LISTEN)
|
|
if (sk->sk_state == IUCV_LISTEN)
|
|
return iucv_accept_poll(sk);
|
|
return iucv_accept_poll(sk);
|
|
|
|
|
|
@@ -2388,7 +2385,7 @@ static const struct proto_ops iucv_sock_ops = {
|
|
.getname = iucv_sock_getname,
|
|
.getname = iucv_sock_getname,
|
|
.sendmsg = iucv_sock_sendmsg,
|
|
.sendmsg = iucv_sock_sendmsg,
|
|
.recvmsg = iucv_sock_recvmsg,
|
|
.recvmsg = iucv_sock_recvmsg,
|
|
- .poll = iucv_sock_poll,
|
|
|
|
|
|
+ .poll_mask = iucv_sock_poll_mask,
|
|
.ioctl = sock_no_ioctl,
|
|
.ioctl = sock_no_ioctl,
|
|
.mmap = sock_no_mmap,
|
|
.mmap = sock_no_mmap,
|
|
.socketpair = sock_no_socketpair,
|
|
.socketpair = sock_no_socketpair,
|