diff options
author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-02-25 22:34:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-02-26 11:49:05 -0500 |
commit | f4b6bcc7002f0e3a3428bac33cf1945abff95450 (patch) | |
tree | 12631c8e4f27bc0274072aaa9fb72eb1b6d96e88 /net/core/devlink.c | |
parent | d8cf757fbd3ee96a449f656707e773c91ca805b8 (diff) |
net: devlink: turn devlink into a built-in
Being able to build devlink as a module causes growing pains.
First all drivers had to add a meta dependency to make sure
they are not built in when devlink is built as a module. Now
we are struggling to invoke ethtool compat code reliably.
Make devlink code built-in, users can still not build it at
all but the dynamically loadable module option is removed.
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/devlink.c')
-rw-r--r-- | net/core/devlink.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index 4f31ddc883e7..05e04ea0a5c7 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c | |||
@@ -6482,20 +6482,9 @@ int devlink_compat_flash_update(struct net_device *dev, const char *file_name) | |||
6482 | return -EOPNOTSUPP; | 6482 | return -EOPNOTSUPP; |
6483 | } | 6483 | } |
6484 | 6484 | ||
6485 | static int __init devlink_module_init(void) | 6485 | static int __init devlink_init(void) |
6486 | { | 6486 | { |
6487 | return genl_register_family(&devlink_nl_family); | 6487 | return genl_register_family(&devlink_nl_family); |
6488 | } | 6488 | } |
6489 | 6489 | ||
6490 | static void __exit devlink_module_exit(void) | 6490 | subsys_initcall(devlink_init); |
6491 | { | ||
6492 | genl_unregister_family(&devlink_nl_family); | ||
6493 | } | ||
6494 | |||
6495 | module_init(devlink_module_init); | ||
6496 | module_exit(devlink_module_exit); | ||
6497 | |||
6498 | MODULE_LICENSE("GPL v2"); | ||
6499 | MODULE_AUTHOR("Jiri Pirko <jiri@mellanox.com>"); | ||
6500 | MODULE_DESCRIPTION("Network physical device Netlink interface"); | ||
6501 | MODULE_ALIAS_GENL_FAMILY(DEVLINK_GENL_NAME); | ||