diff options
| author | Thomas Gleixner <[email protected]> | 2025-07-09 09:51:34 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2025-07-09 09:51:34 +0000 |
| commit | 068f7b64bf2054e20bbbd0782aa11f6ff8d17105 (patch) | |
| tree | f9f88dfe79f4be4789480dc22f74908b3484a8f8 /drivers/net/veth.c | |
| parent | timekeeping: Remove the temporary CLOCK_AUX workaround (diff) | |
| parent | Linux 6.16-rc2 (diff) | |
| download | kernel-068f7b64bf2054e20bbbd0782aa11f6ff8d17105.tar.gz kernel-068f7b64bf2054e20bbbd0782aa11f6ff8d17105.zip | |
Merge v6.16-rc2 into timers/ptp
to pick up the __GENMASK() fix, otherwise the AUX clock VDSO patches fail
to compile for compat.
Signed-off-by: Thomas Gleixner <[email protected]>
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index e58a0f1b5c5b..a3046142cb8e 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -909,7 +909,7 @@ static int veth_xdp_rcv(struct veth_rq *rq, int budget, /* NAPI functions as RCU section */ peer_dev = rcu_dereference_check(priv->peer, rcu_read_lock_bh_held()); - peer_txq = netdev_get_tx_queue(peer_dev, queue_idx); + peer_txq = peer_dev ? netdev_get_tx_queue(peer_dev, queue_idx) : NULL; for (i = 0; i < budget; i++) { void *ptr = __ptr_ring_consume(&rq->xdp_ring); @@ -959,7 +959,7 @@ static int veth_xdp_rcv(struct veth_rq *rq, int budget, rq->stats.vs.xdp_packets += done; u64_stats_update_end(&rq->stats.syncp); - if (unlikely(netif_tx_queue_stopped(peer_txq))) + if (peer_txq && unlikely(netif_tx_queue_stopped(peer_txq))) netif_tx_wake_queue(peer_txq); return done; |