diff options
Diffstat (limited to 'net/packet/af_packet.c')
-rw-r--r-- | net/packet/af_packet.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index ff8e7e245c37..57634bc3da74 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -4076,11 +4076,12 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd, | |||
4076 | return 0; | 4076 | return 0; |
4077 | } | 4077 | } |
4078 | 4078 | ||
4079 | static __poll_t packet_poll_mask(struct socket *sock, __poll_t events) | 4079 | static __poll_t packet_poll(struct file *file, struct socket *sock, |
4080 | poll_table *wait) | ||
4080 | { | 4081 | { |
4081 | struct sock *sk = sock->sk; | 4082 | struct sock *sk = sock->sk; |
4082 | struct packet_sock *po = pkt_sk(sk); | 4083 | struct packet_sock *po = pkt_sk(sk); |
4083 | __poll_t mask = datagram_poll_mask(sock, events); | 4084 | __poll_t mask = datagram_poll(file, sock, wait); |
4084 | 4085 | ||
4085 | spin_lock_bh(&sk->sk_receive_queue.lock); | 4086 | spin_lock_bh(&sk->sk_receive_queue.lock); |
4086 | if (po->rx_ring.pg_vec) { | 4087 | if (po->rx_ring.pg_vec) { |
@@ -4422,7 +4423,7 @@ static const struct proto_ops packet_ops_spkt = { | |||
4422 | .socketpair = sock_no_socketpair, | 4423 | .socketpair = sock_no_socketpair, |
4423 | .accept = sock_no_accept, | 4424 | .accept = sock_no_accept, |
4424 | .getname = packet_getname_spkt, | 4425 | .getname = packet_getname_spkt, |
4425 | .poll_mask = datagram_poll_mask, | 4426 | .poll = datagram_poll, |
4426 | .ioctl = packet_ioctl, | 4427 | .ioctl = packet_ioctl, |
4427 | .listen = sock_no_listen, | 4428 | .listen = sock_no_listen, |
4428 | .shutdown = sock_no_shutdown, | 4429 | .shutdown = sock_no_shutdown, |
@@ -4443,7 +4444,7 @@ static const struct proto_ops packet_ops = { | |||
4443 | .socketpair = sock_no_socketpair, | 4444 | .socketpair = sock_no_socketpair, |
4444 | .accept = sock_no_accept, | 4445 | .accept = sock_no_accept, |
4445 | .getname = packet_getname, | 4446 | .getname = packet_getname, |
4446 | .poll_mask = packet_poll_mask, | 4447 | .poll = packet_poll, |
4447 | .ioctl = packet_ioctl, | 4448 | .ioctl = packet_ioctl, |
4448 | .listen = sock_no_listen, | 4449 | .listen = sock_no_listen, |
4449 | .shutdown = sock_no_shutdown, | 4450 | .shutdown = sock_no_shutdown, |