diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-05-11 08:48:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-05-11 08:48:31 +0200 |
| commit | ea09c82fbc53aad867541cd2f0bde96c6b228ba0 (patch) | |
| tree | 803220c6ee761605b4cf502b924c20ed25e96be6 /drivers/net/netdevsim/netdev.c | |
| parent | 81f55766523e5293604cb96c5e98d10da345ff33 (diff) | |
| parent | 5d6919055dec134de3c40167a490f33c74c12581 (diff) | |
Merge tag 'v7.1-rc3' into staging-next
We need the staging fixes in here to build off of.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 a05af192caf3..a750768912b5 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -1182,7 +1182,8 @@ void nsim_destroy(struct netdevsim *ns) unregister_netdevice_notifier_dev_net(ns->netdev, &ns->nb, &ns->nn); - nsim_psp_uninit(ns); + if (nsim_dev_port_is_pf(ns->nsim_dev_port)) + nsim_psp_uninit(ns); rtnl_lock(); peer = rtnl_dereference(ns->peer); |