net/smc: fewer parameters for smc_llc_send_confirm_link()

Link confirmation will always be sent across the new link being
confirmed. This allows to shrink the parameter list.
No functional change.

Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 7fc810ec31c502e30c9604b82f047ff382ac0d22..7883f70f7c6d64e8c69bbe017bb483a64322fa64 100644 (file)
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -352,10 +352,7 @@ static int smc_clnt_conf_first_link(struct smc_sock *smc)
                return SMC_CLC_DECL_INTERR;
 
        /* send CONFIRM LINK response over RoCE fabric */
-       rc = smc_llc_send_confirm_link(link,
-                                      link->smcibdev->mac[link->ibport - 1],
-                                      &link->smcibdev->gid[link->ibport - 1],
-                                      SMC_LLC_RESP);
+       rc = smc_llc_send_confirm_link(link, SMC_LLC_RESP);
        if (rc < 0)
                return SMC_CLC_DECL_TCL;
 
@@ -951,10 +948,7 @@ static int smc_serv_conf_first_link(struct smc_sock *smc)
                return SMC_CLC_DECL_INTERR;
 
        /* send CONFIRM LINK request to client over the RoCE fabric */
-       rc = smc_llc_send_confirm_link(link,
-                                      link->smcibdev->mac[link->ibport - 1],
-                                      &link->smcibdev->gid[link->ibport - 1],
-                                      SMC_LLC_REQ);
+       rc = smc_llc_send_confirm_link(link, SMC_LLC_REQ);
        if (rc < 0)
                return SMC_CLC_DECL_TCL;
 

diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c
index b7944aa1ffc33f177e243703d733882f80a61055..f2ba99c2e69a8d03c989f420a959a1d5f0c495a5 100644 (file)
--- a/net/smc/smc_llc.c
+++ b/net/smc/smc_llc.c
@@ -182,8 +182,7 @@ static int smc_llc_add_pending_send(struct smc_link *link,
 }
 
 /* high-level API to send LLC confirm link */
-int smc_llc_send_confirm_link(struct smc_link *link, u8 mac[],
-                             union ib_gid *gid,
+int smc_llc_send_confirm_link(struct smc_link *link,
                              enum smc_llc_reqresp reqresp)
 {
        struct smc_link_group *lgr = smc_get_lgr(link);
@@ -202,8 +201,10 @@ int smc_llc_send_confirm_link(struct smc_link *link, u8 mac[],
        confllc->hd.flags |= SMC_LLC_FLAG_NO_RMBE_EYEC;
        if (reqresp == SMC_LLC_RESP)
                confllc->hd.flags |= SMC_LLC_FLAG_RESP;
-       memcpy(confllc->sender_mac, mac, ETH_ALEN);
-       memcpy(confllc->sender_gid, gid, SMC_GID_SIZE);
+       memcpy(confllc->sender_mac, link->smcibdev->mac[link->ibport - 1],
+              ETH_ALEN);
+       memcpy(confllc->sender_gid, &link->smcibdev->gid[link->ibport - 1],
+              SMC_GID_SIZE);
        hton24(confllc->sender_qp_num, link->roce_qp->qp_num);
        confllc->link_num = link->link_id;
        memcpy(confllc->link_uid, lgr->id, SMC_LGR_ID_SIZE);

diff --git a/net/smc/smc_llc.h b/net/smc/smc_llc.h
index 65c8645e96a1438febacdcbe3470003d5b75b504..9a29fcbbcea8aec2d0f274735a1ddd665949f3fc 100644 (file)
--- a/net/smc/smc_llc.h
+++ b/net/smc/smc_llc.h
@@ -36,7 +36,7 @@ enum smc_llc_msg_type {
 };
 
 /* transmit */
-int smc_llc_send_confirm_link(struct smc_link *lnk, u8 mac[], union ib_gid *gid,
+int smc_llc_send_confirm_link(struct smc_link *lnk,
                              enum smc_llc_reqresp reqresp);
 int smc_llc_send_add_link(struct smc_link *link, u8 mac[], union ib_gid *gid,
                          enum smc_llc_reqresp reqresp);