On Mon, Jul 25, 2022 at 04:10:00PM +0200, Wenjia Zhang wrote:
> From: Stefan Raspl <raspl@xxxxxxxxxxxxx>
>
> Previously, the smc and smc_diag modules were automatically loaded as
> dependencies of the ism module whenever an ISM device was present.
> With the pending rework of the ISM API, the smc module will no longer
> automatically be loaded in presence of an ISM device. Usage of an AF_SMC
> socket will still trigger loading of the smc modules, but usage of a
> netlink socket will not.
> This is addressed by setting the correct module aliases.
>
> Signed-off-by: Stefan Raspl <raspl@xxxxxxxxxxxxx>
> Signed-off-by: Wenjia Zhang < wenjia@xxxxxxxxxxxxx>
This patch looks good to me.
Reviewed-by: Tony Lu <tonylu@xxxxxxxxxxxxxxxxx>
> ---
> net/smc/af_smc.c | 1 +
> net/smc/smc_diag.c | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
> index 6e70d9c10b78..79c1318af1fe 100644
> --- a/net/smc/af_smc.c
> +++ b/net/smc/af_smc.c
> @@ -3515,3 +3515,4 @@ MODULE_DESCRIPTION("smc socket address family");
> MODULE_LICENSE("GPL");
> MODULE_ALIAS_NETPROTO(PF_SMC);
> MODULE_ALIAS_TCP_ULP("smc");
> +MODULE_ALIAS_GENL_FAMILY(SMC_GENL_FAMILY_NAME);
> diff --git a/net/smc/smc_diag.c b/net/smc/smc_diag.c
> index 1fca2f90a9c7..80ea7d954ece 100644
> --- a/net/smc/smc_diag.c
> +++ b/net/smc/smc_diag.c
> @@ -268,3 +268,4 @@ module_init(smc_diag_init);
> module_exit(smc_diag_exit);
> MODULE_LICENSE("GPL");
> MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_NETLINK, NETLINK_SOCK_DIAG, 43 /* AF_SMC */);
> +MODULE_ALIAS_GENL_FAMILY(SMCR_GENL_FAMILY_NAME);
> --
> 2.35.2
