Merge tag 'net-next-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[thirdparty/kernel/linux.git] / net / smc / smc_clc.h

diff --git a/net/smc/smc_clc.h b/net/smc/smc_clc.h
index 7cc7070b9772de621f55af972071c4700790922c..467effb50cd65789c61da846de681687aedc41d6 100644 (file)
--- a/net/smc/smc_clc.h
+++ b/net/smc/smc_clc.h
@@ -134,12 +134,15 @@ struct smc_clc_smcd_gid_chid {
                         */
 
 struct smc_clc_v2_extension {
-       struct smc_clnt_opts_area_hdr hdr;
-       u8 roce[16];            /* RoCEv2 GID */
-       u8 max_conns;
-       u8 max_links;
-       __be16 feature_mask;
-       u8 reserved[12];
+       /* New members must be added within the struct_group() macro below. */
+       struct_group_tagged(smc_clc_v2_extension_fixed, fixed,
+               struct smc_clnt_opts_area_hdr hdr;
+               u8 roce[16];            /* RoCEv2 GID */
+               u8 max_conns;
+               u8 max_links;
+               __be16 feature_mask;
+               u8 reserved[12];
+       );
        u8 user_eids[][SMC_MAX_EID_LEN];
 };
 
@@ -159,8 +162,11 @@ struct smc_clc_msg_smcd {  /* SMC-D GID information */
 };
 
 struct smc_clc_smcd_v2_extension {
-       u8 system_eid[SMC_MAX_EID_LEN];
-       u8 reserved[16];
+       /* New members must be added within the struct_group() macro below. */
+       struct_group_tagged(smc_clc_smcd_v2_extension_fixed, fixed,
+               u8 system_eid[SMC_MAX_EID_LEN];
+               u8 reserved[16];
+       );
        struct smc_clc_smcd_gid_chid gidchid[];
 };
 
@@ -183,9 +189,9 @@ struct smc_clc_msg_proposal_area {
        struct smc_clc_msg_smcd                 pclc_smcd;
        struct smc_clc_msg_proposal_prefix      pclc_prfx;
        struct smc_clc_ipv6_prefix      pclc_prfx_ipv6[SMC_CLC_MAX_V6_PREFIX];
-       struct smc_clc_v2_extension             pclc_v2_ext;
+       struct smc_clc_v2_extension_fixed       pclc_v2_ext;
        u8                      user_eids[SMC_CLC_MAX_UEID][SMC_MAX_EID_LEN];
-       struct smc_clc_smcd_v2_extension        pclc_smcd_v2_ext;
+       struct smc_clc_smcd_v2_extension_fixed  pclc_smcd_v2_ext;
        struct smc_clc_smcd_gid_chid
                                pclc_gidchids[SMCD_CLC_MAX_V2_GID_ENTRIES];
        struct smc_clc_msg_trail                pclc_trl;