aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin KaFai Lau <[email protected]>2022-11-09 20:57:16 -0800
committerMartin KaFai Lau <[email protected]>2022-11-09 21:02:24 -0800
commitc7028aa2fb03597e85ad2ac1ad0ac319ace00418 (patch)
tree40d748a17c066da172a6c82df85b18136ac5e26a
parentfd74b79df0d1c9506583d0b52e3d7562a38ac34a (diff)
parent5e5dc33d5dacb34b0165061bc5a10efd2fd3b66f (diff)
Merge branch 'fix panic bringing up veth with xdp progs'
John Fastabend says: ==================== Not sure if folks want to take this through BPF tree or networking tree. I took a quick look and didn't see any pending fixes so seems no one has noticed the panic yet. It reproducible and easy to repro. I put bpf in the title thinking it woudl be great to run through the BPF selftests given its XDP triggering the panic. Sorry maintainers resent with CC'ing actual lists. Had a scripting issue. Also dropped henqqi has they are bouncing. Thanks! ==================== Signed-off-by: Martin KaFai Lau <[email protected]>
-rw-r--r--drivers/net/veth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index b1ed5a93b6c5..2a4592780141 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -1125,7 +1125,7 @@ static int veth_enable_xdp(struct net_device *dev)
int err, i;
rq = &priv->rq[0];
- napi_already_on = (dev->flags & IFF_UP) && rcu_access_pointer(rq->napi);
+ napi_already_on = rcu_access_pointer(rq->napi);
if (!xdp_rxq_info_is_reg(&priv->rq[0].xdp_rxq)) {
err = veth_enable_xdp_range(dev, 0, dev->real_num_rx_queues, napi_already_on);