diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-02-26 15:10:55 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2024-02-26 15:12:53 +0100 |
| commit | b0fda2fcb472454474b858a06419249d7eca56db (patch) | |
| tree | b9e111922464bb944c719a26c49e7fe1edb27095 /drivers/net/netdevsim/dev.c | |
| parent | drm/i915: Fix possible null pointer dereference after drm_dbg_printer conversion (diff) | |
| parent | Merge v6.8-rc6 into drm-next (diff) | |
| download | linux-b0fda2fcb472454474b858a06419249d7eca56db.tar.gz linux-b0fda2fcb472454474b858a06419249d7eca56db.zip | |
Merge drm/drm-next into drm-misc-next-fixes
Backmerging from drm/drm-next to prepare drm-misc-next-fixes for
the rest of the release cycle.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/net/netdevsim/dev.c')
| -rw-r--r-- | drivers/net/netdevsim/dev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index b4d3b9cde8bd..92a7a36b93ac 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -835,14 +835,14 @@ static void nsim_dev_trap_report_work(struct work_struct *work) trap_report_dw.work); nsim_dev = nsim_trap_data->nsim_dev; - /* For each running port and enabled packet trap, generate a UDP - * packet with a random 5-tuple and report it. - */ if (!devl_trylock(priv_to_devlink(nsim_dev))) { - schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw, 0); + schedule_delayed_work(&nsim_dev->trap_data->trap_report_dw, 1); return; } + /* For each running port and enabled packet trap, generate a UDP + * packet with a random 5-tuple and report it. + */ list_for_each_entry(nsim_dev_port, &nsim_dev->port_list, list) { if (!netif_running(nsim_dev_port->ns->netdev)) continue; |