net/smc: simplify test_link function usage

Make smc_llc_send_test_link() static and remove it from the header file.
And to send a test_link response set the response flag and send the
message back as-is, without using smc_llc_send_test_link(). And because
smc_llc_send_test_link() must no longer send responses, remove the
response flag handling from the function.

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

2 files changed, 5 insertions, 9 deletions

diff --git a/net/smc/smc_llc.c b/net/smc/smc_llc.c
index 29f59b47b559..229e967c7940 100644
--- a/net/smc/smc_llc.c
+++ b/net/smc/smc_llc.c
@@ -296,9 +296,8 @@ int smc_llc_send_delete_link(struct smc_link *link,
         return rc;
 }
 
-/* send LLC test link request or response */
-int smc_llc_send_test_link(struct smc_link *link, u8 user_data[16],
-                           enum smc_llc_reqresp reqresp)
+/* send LLC test link request */
+static int smc_llc_send_test_link(struct smc_link *link, u8 user_data[16])
 {
         struct smc_llc_msg_test_link *testllc;
         struct smc_wr_tx_pend_priv *pend;
@@ -312,8 +311,6 @@ int smc_llc_send_test_link(struct smc_link *link, u8 user_data[16],
         memset(testllc, 0, sizeof(*testllc));
         testllc->hd.common.type = SMC_LLC_TEST_LINK;
         testllc->hd.length = sizeof(struct smc_llc_msg_test_link);
-        if (reqresp == SMC_LLC_RESP)
-                testllc->hd.flags |= SMC_LLC_FLAG_RESP;
         memcpy(testllc->user_data, user_data, sizeof(testllc->user_data));
         /* send llc message */
         rc = smc_wr_tx_send(link, pend);
@@ -425,7 +422,8 @@ static void smc_llc_rx_test_link(struct smc_link *link,
                 if (link->state == SMC_LNK_ACTIVE)
                         complete(&link->llc_testlink_resp);
         } else {
-                smc_llc_send_test_link(link, llc->user_data, SMC_LLC_RESP);
+                llc->hd.flags |= SMC_LLC_FLAG_RESP;
+                smc_llc_send_message(link, llc, sizeof(*llc));
         }
 }
 
@@ -551,7 +549,7 @@ static void smc_llc_testlink_work(struct work_struct *work)
                 goto out;
         }
         reinit_completion(&link->llc_testlink_resp);
-        smc_llc_send_test_link(link, user_data, SMC_LLC_REQ);
+        smc_llc_send_test_link(link, user_data);
         /* receive TEST LINK response over RoCE fabric */
         rc = wait_for_completion_interruptible_timeout(&link->llc_testlink_resp,
                                                        SMC_LLC_WAIT_TIME);
diff --git a/net/smc/smc_llc.h b/net/smc/smc_llc.h
index 728823dd8ae5..fb137f24aa6b 100644
--- a/net/smc/smc_llc.h
+++ b/net/smc/smc_llc.h
@@ -42,8 +42,6 @@ int smc_llc_send_add_link(struct smc_link *link, u8 mac[], union ib_gid *gid,
                           enum smc_llc_reqresp reqresp);
 int smc_llc_send_delete_link(struct smc_link *link,
                              enum smc_llc_reqresp reqresp);
-int smc_llc_send_test_link(struct smc_link *lnk, u8 user_data[16],
-                           enum smc_llc_reqresp reqresp);
 void smc_llc_link_active(struct smc_link *link, int testlink_time);
 void smc_llc_link_inactive(struct smc_link *link);
 void smc_llc_link_flush(struct smc_link *link);