diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-01-06 01:36:10 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-01-06 01:36:10 +0300 |
| commit | b9adba350a841e8233d3e4d8d3c8dede3fc88c46 (patch) | |
| tree | 2fbaa3fb25cf76d44a510e0c4f96c02622e268f9 /net/xdp | |
| parent | 4e4f325a0a55907b14f579e6b1a38c53755e3de2 (diff) | |
| parent | 75acfdb6fd922598a408a0d864486aeb167c1a97 (diff) | |
| download | linux-b9adba350a841e8233d3e4d8d3c8dede3fc88c46.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/xdp')
| -rw-r--r-- | net/xdp/xsk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index e3d35850fdea..28ef3f4465ae 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -677,6 +677,8 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock, struct xdp_sock *xs = xdp_sk(sk); struct xsk_buff_pool *pool; + sock_poll_wait(file, sock, wait); + if (unlikely(!xsk_is_bound(xs))) return mask; @@ -688,8 +690,6 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock, else /* Poll needs to drive Tx also in copy mode */ __xsk_sendmsg(sk); - } else { - sock_poll_wait(file, sock, wait); } if (xs->rx && !xskq_prod_is_empty(xs->rx)) |