diff options
| author | David Ahern <dsahern@gmail.com> | 2019-08-06 22:15:17 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-12 06:59:19 +0300 |
| commit | 59c84b9fcf42c99a945d5fdc49220d854e539690 (patch) | |
| tree | bd1f9efcee0af16dbf962e7437203663552f1fc4 /drivers/net/netdevsim/netdev.c | |
| parent | 9481382b36fe1dbdada9303ebd6b9dba915da989 (diff) | |
| download | linux-59c84b9fcf42c99a945d5fdc49220d854e539690.tar.xz | |
netdevsim: Restore per-network namespace accounting for fib entries
Prior to the commit in the fixes tag, the resource controller in netdevsim
tracked fib entries and rules per network namespace. Restore that behavior.
Fixes: 5fc494225c1e ("netdevsim: create devlink instance per netdevsim instance")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netdevsim/netdev.c')
| -rw-r--r-- | drivers/net/netdevsim/netdev.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index 0740940f41b1..55f57f76d01b 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -357,12 +357,18 @@ static int __init nsim_module_init(void) if (err) goto err_dev_exit; - err = rtnl_link_register(&nsim_link_ops); + err = nsim_fib_init(); if (err) goto err_bus_exit; + err = rtnl_link_register(&nsim_link_ops); + if (err) + goto err_fib_exit; + return 0; +err_fib_exit: + nsim_fib_exit(); err_bus_exit: nsim_bus_exit(); err_dev_exit: @@ -373,6 +379,7 @@ err_dev_exit: static void __exit nsim_module_exit(void) { rtnl_link_unregister(&nsim_link_ops); + nsim_fib_exit(); nsim_bus_exit(); nsim_dev_exit(); } |