]> git.baikalelectronics.ru Git - kernel.git/commit
net, xdp, xsk: fix __sk_mark_napi_id_once napi_id error
authorDaniel Borkmann <daniel@iogearbox.net>
Tue, 1 Dec 2020 14:22:59 +0000 (15:22 +0100)
committerDaniel Borkmann <daniel@iogearbox.net>
Tue, 1 Dec 2020 14:51:19 +0000 (15:51 +0100)
commite1fc8c16c7d6dedb555008e84fc4236d9e51c4b4
tree2179cfeb9bec1ba39c25a9fe634be6a75d71ef30
parent29dfb33b8003ec75bccf1d4baafc41cc480adcbc
net, xdp, xsk: fix __sk_mark_napi_id_once napi_id error

Stephen reported the following build error for !CONFIG_NET_RX_BUSY_POLL
built kernels:

  In file included from fs/select.c:32:
  include/net/busy_poll.h: In function 'sk_mark_napi_id_once':
  include/net/busy_poll.h:150:36: error: 'const struct sk_buff' has no member named 'napi_id'
    150 |  __sk_mark_napi_id_once_xdp(sk, skb->napi_id);
        |                                    ^~

Fix it by wrapping a CONFIG_NET_RX_BUSY_POLL around the helpers.

Fixes: 3e7eb5f5334a ("xsk: Propagate napi_id to XDP socket Rx path")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Cc: Björn Töpel <bjorn.topel@intel.com>
Link: https://lore.kernel.org/linux-next/20201201190746.7d3357fb@canb.auug.org.au
include/net/busy_poll.h