OSDN Git Service

netdevsim: take devlink net instead of init_net
authorJiri Pirko <jiri@mellanox.com>
Thu, 3 Oct 2019 09:49:38 +0000 (11:49 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 4 Oct 2019 18:10:56 +0000 (11:10 -0700)
Follow-up patch is going to allow to reload devlink instance into
different network namespace, so use devlink_net() helper instead
of init_net.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/netdevsim/fib.c

index fdc682f..13540de 100644 (file)
@@ -260,7 +260,7 @@ struct nsim_fib_data *nsim_fib_create(struct devlink *devlink,
        nsim_fib_set_max_all(data, devlink);
 
        data->fib_nb.notifier_call = nsim_fib_event_nb;
-       err = register_fib_notifier(&init_net, &data->fib_nb,
+       err = register_fib_notifier(devlink_net(devlink), &data->fib_nb,
                                    nsim_fib_dump_inconsistent, extack);
        if (err) {
                pr_err("Failed to register fib notifier\n");
@@ -300,6 +300,6 @@ void nsim_fib_destroy(struct devlink *devlink, struct nsim_fib_data *data)
                                            NSIM_RESOURCE_IPV4_FIB_RULES);
        devlink_resource_occ_get_unregister(devlink,
                                            NSIM_RESOURCE_IPV4_FIB);
-       unregister_fib_notifier(&init_net, &data->fib_nb);
+       unregister_fib_notifier(devlink_net(devlink), &data->fib_nb);
        kfree(data);
 }