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/netdevsim/netdev.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/netdevsim/netdev.c')
| -rw-r--r-- | drivers/net/netdevsim/netdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index af545d42961c..fa5fbd97ad69 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -371,7 +371,8 @@ static int nsim_poll(struct napi_struct *napi, int budget) int done; done = nsim_rcv(rq, budget); - napi_complete(napi); + if (done < budget) + napi_complete_done(napi, done); return done; } |