3 files changed, 13 insertions, 6 deletions

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 647a5e2beee4..ba619fa84662 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -2318,7 +2318,7 @@ isert_put_text_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn)
         int rc;
 
         isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc);
-        rc = iscsit_build_text_rsp(cmd, conn, hdr);
+        rc = iscsit_build_text_rsp(cmd, conn, hdr, ISCSI_INFINIBAND);
         if (rc < 0)
                 return rc;
 
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index e0d98344e4bd..b87721a01b74 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -3389,7 +3389,9 @@ static bool iscsit_check_inaddr_any(struct iscsi_np *np)
 
 #define SENDTARGETS_BUF_LIMIT 32768U
 
-static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd)
+static int
+iscsit_build_sendtargets_response(struct iscsi_cmd *cmd,
+                                  enum iscsit_transport_type network_transport)
 {
         char *payload = NULL;
         struct iscsi_conn *conn = cmd->conn;
@@ -3466,6 +3468,9 @@ static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd)
                                 struct iscsi_np *np = tpg_np->tpg_np;
                                 bool inaddr_any = iscsit_check_inaddr_any(np);
 
+                                if (np->np_network_transport != network_transport)
+                                        continue;
+
                                 if (!target_name_printed) {
                                         len = sprintf(buf, "TargetName=%s",
                                                       tiqn->tiqn);
@@ -3517,11 +3522,12 @@ eob:
 
 int
 iscsit_build_text_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn,
-                      struct iscsi_text_rsp *hdr)
+                      struct iscsi_text_rsp *hdr,
+                      enum iscsit_transport_type network_transport)
 {
         int text_length, padding;
 
-        text_length = iscsit_build_sendtargets_response(cmd);
+        text_length = iscsit_build_sendtargets_response(cmd, network_transport);
         if (text_length < 0)
                 return text_length;
 
@@ -3559,7 +3565,7 @@ static int iscsit_send_text_rsp(
         u32 tx_size = 0;
         int text_length, iov_count = 0, rc;
 
-        rc = iscsit_build_text_rsp(cmd, conn, hdr);
+        rc = iscsit_build_text_rsp(cmd, conn, hdr, ISCSI_TCP);
         if (rc < 0)
                 return rc;
 
diff --git a/include/target/iscsi/iscsi_transport.h b/include/target/iscsi/iscsi_transport.h
index 33b487b5da92..daef9daa500c 100644
--- a/include/target/iscsi/iscsi_transport.h
+++ b/include/target/iscsi/iscsi_transport.h
@@ -70,7 +70,8 @@ extern void iscsit_build_nopin_rsp(struct iscsi_cmd *, struct iscsi_conn *,
 extern void iscsit_build_task_mgt_rsp(struct iscsi_cmd *, struct iscsi_conn *,
                                 struct iscsi_tm_rsp *);
 extern int iscsit_build_text_rsp(struct iscsi_cmd *, struct iscsi_conn *,
-                                struct iscsi_text_rsp *);
+                                struct iscsi_text_rsp *,
+                                enum iscsit_transport_type);
 extern void iscsit_build_reject(struct iscsi_cmd *, struct iscsi_conn *,
                                 struct iscsi_reject *);
 extern int iscsit_build_logout_rsp(struct iscsi_cmd *, struct iscsi_conn *,