Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

[linux-2.6-microblaze.git] / net / xdp / xsk.c

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 0900238..5b4ce6b 100644 (file)
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -639,8 +639,11 @@ static int __xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len
        if (unlikely(need_wait))
                return -EOPNOTSUPP;
 
-       if (sk_can_busy_loop(sk))
+       if (sk_can_busy_loop(sk)) {
+               if (xs->zc)
+                       __sk_mark_napi_id_once(sk, xsk_pool_get_napi_id(xs->pool));
                sk_busy_loop(sk, 1); /* only support non-blocking sockets */
+       }
 
        if (xs->zc && xsk_no_wakeup(sk))
                return 0;