Merge branch 'for-6.9/amd-sfh' into for-linus

[sfrench/cifs-2.6.git] / drivers / net / netdevsim / netdev.c

diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index aecaf5f44374f0a7eb92eb3db46f5a0ec24c5ee9..77e8250282a512ee5cf2f05d9bed4b604e5c210b 100644 (file)
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -369,6 +369,12 @@ static int nsim_init_netdevsim_vf(struct netdevsim *ns)
        return err;
 }
 
+static void nsim_exit_netdevsim(struct netdevsim *ns)
+{
+       nsim_udp_tunnels_info_destroy(ns->netdev);
+       mock_phc_destroy(ns->phc);
+}
+
 struct netdevsim *
 nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port)
 {
@@ -417,8 +423,7 @@ void nsim_destroy(struct netdevsim *ns)
        }
        rtnl_unlock();
        if (nsim_dev_port_is_pf(ns->nsim_dev_port))
-               nsim_udp_tunnels_info_destroy(dev);
-       mock_phc_destroy(ns->phc);
+               nsim_exit_netdevsim(ns);
        free_netdev(dev);
 }