2 files changed, 27 insertions, 25 deletions

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index 3200059d14b2..26ca8dd64ded 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -135,15 +135,6 @@ const struct nla_policy tipc_nl_udp_policy[TIPC_NLA_UDP_MAX + 1] = {
 /* Users of the legacy API (tipc-config) can't handle that we add operations,
  * so we have a separate genl handling for the new API.
  */
-struct genl_family tipc_genl_family = {
-        .id             = GENL_ID_GENERATE,
-        .name           = TIPC_GENL_V2_NAME,
-        .version        = TIPC_GENL_V2_VERSION,
-        .hdrsize        = 0,
-        .maxattr        = TIPC_NLA_MAX,
-        .netnsok        = true,
-};
-
 static const struct genl_ops tipc_genl_v2_ops[] = {
         {
                 .cmd    = TIPC_NL_BEARER_DISABLE,
@@ -258,23 +249,33 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
 #endif
 };
 
+struct genl_family tipc_genl_family __ro_after_init = {
+        .name           = TIPC_GENL_V2_NAME,
+        .version        = TIPC_GENL_V2_VERSION,
+        .hdrsize        = 0,
+        .maxattr        = TIPC_NLA_MAX,
+        .netnsok        = true,
+        .module         = THIS_MODULE,
+        .ops            = tipc_genl_v2_ops,
+        .n_ops          = ARRAY_SIZE(tipc_genl_v2_ops),
+};
+
 int tipc_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr ***attr)
 {
         u32 maxattr = tipc_genl_family.maxattr;
 
-        *attr = tipc_genl_family.attrbuf;
+        *attr = genl_family_attrbuf(&tipc_genl_family);
         if (!*attr)
                 return -EOPNOTSUPP;
 
         return nlmsg_parse(nlh, GENL_HDRLEN, *attr, maxattr, tipc_nl_policy);
 }
 
-int tipc_netlink_start(void)
+int __init tipc_netlink_start(void)
 {
         int res;
 
-        res = genl_register_family_with_ops(&tipc_genl_family,
-                                            tipc_genl_v2_ops);
+        res = genl_register_family(&tipc_genl_family);
         if (res) {
                 pr_err("Failed to register netlink interface\n");
                 return res;
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 1fd464764765..e1ae8a8a2b8e 100644
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -1215,15 +1215,6 @@ send:
         return err;
 }
 
-static struct genl_family tipc_genl_compat_family = {
-        .id             = GENL_ID_GENERATE,
-        .name           = TIPC_GENL_NAME,
-        .version        = TIPC_GENL_VERSION,
-        .hdrsize        = TIPC_GENL_HDRLEN,
-        .maxattr        = 0,
-        .netnsok        = true,
-};
-
 static struct genl_ops tipc_genl_compat_ops[] = {
         {
                 .cmd            = TIPC_GENL_CMD,
@@ -1231,12 +1222,22 @@ static struct genl_ops tipc_genl_compat_ops[] = {
         },
 };
 
-int tipc_netlink_compat_start(void)
+static struct genl_family tipc_genl_compat_family __ro_after_init = {
+        .name           = TIPC_GENL_NAME,
+        .version        = TIPC_GENL_VERSION,
+        .hdrsize        = TIPC_GENL_HDRLEN,
+        .maxattr        = 0,
+        .netnsok        = true,
+        .module         = THIS_MODULE,
+        .ops            = tipc_genl_compat_ops,
+        .n_ops          = ARRAY_SIZE(tipc_genl_compat_ops),
+};
+
+int __init tipc_netlink_compat_start(void)
 {
         int res;
 
-        res = genl_register_family_with_ops(&tipc_genl_compat_family,
-                                            tipc_genl_compat_ops);
+        res = genl_register_family(&tipc_genl_compat_family);
         if (res) {
                 pr_err("Failed to register legacy compat interface\n");
                 return res;