diff options
Diffstat (limited to 'net/tipc/netlink_compat.c')
| -rw-r--r-- | net/tipc/netlink_compat.c | 25 | 
1 files changed, 13 insertions, 12 deletions
| 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; |