Merge tag 'modules-for-v5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

[linux.git] / net / smc / smc_clc.c

diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c
index d53fd588d1f5a4450819934c83cf960dc29ff46b..745afd82f281186f2ca1b580081714893507595f 100644 (file)
--- a/net/smc/smc_clc.c
+++ b/net/smc/smc_clc.c
@@ -385,8 +385,7 @@ int smc_clc_send_decline(struct smc_sock *smc, u32 peer_diag_info)
 
 /* send CLC PROPOSAL message across internal TCP socket */
 int smc_clc_send_proposal(struct smc_sock *smc, int smc_type,
-                         struct smc_ib_device *ibdev, u8 ibport, u8 gid[],
-                         struct smcd_dev *ismdev)
+                         struct smc_init_info *ini)
 {
        struct smc_clc_ipv6_prefix ipv6_prfx[SMC_CLC_MAX_V6_PREFIX];
        struct smc_clc_msg_proposal_prefix pclc_prfx;
@@ -416,8 +415,9 @@ int smc_clc_send_proposal(struct smc_sock *smc, int smc_type,
                /* add SMC-R specifics */
                memcpy(pclc.lcl.id_for_peer, local_systemid,
                       sizeof(local_systemid));
-               memcpy(&pclc.lcl.gid, gid, SMC_GID_SIZE);
-               memcpy(&pclc.lcl.mac, &ibdev->mac[ibport - 1], ETH_ALEN);
+               memcpy(&pclc.lcl.gid, ini->ib_gid, SMC_GID_SIZE);
+               memcpy(&pclc.lcl.mac, &ini->ib_dev->mac[ini->ib_port - 1],
+                      ETH_ALEN);
                pclc.iparea_offset = htons(0);
        }
        if (smc_type == SMC_TYPE_D || smc_type == SMC_TYPE_B) {
@@ -425,7 +425,7 @@ int smc_clc_send_proposal(struct smc_sock *smc, int smc_type,
                memset(&pclc_smcd, 0, sizeof(pclc_smcd));
                plen += sizeof(pclc_smcd);
                pclc.iparea_offset = htons(SMC_CLC_PROPOSAL_MAX_OFFSET);
-               pclc_smcd.gid = ismdev->local_gid;
+               pclc_smcd.gid = ini->ism_dev->local_gid;
        }
        pclc.hdr.length = htons(plen);