qed: Fix build errors.

Orabug: 26783820

Fix build errors caused by the below upstream patches.

7b6859fbdcc4a590c8ef03bcc00d770b42d41c42 qed: Utilize FW 8.20.0.0
712c3cbf193fcadf0ba67da61432beb1a71e400b qed: Replace set_id() api with set_name()

Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c
index 0bbc42fbb6c7f002e7c6a5ad80ab1612b7abe1c5..e72fd3b63c490c48769d8b367efc0107db1604a1 100644 (file)
--- a/drivers/scsi/qedi/qedi_fw.c
+++ b/drivers/scsi/qedi/qedi_fw.c
@@ -2117,7 +2117,7 @@ int qedi_iscsi_send_ioreq(struct iscsi_task *task)
        cmd_pdu_header.expected_transfer_length = cpu_to_be32(hdr->data_length);
        cmd_pdu_header.hdr_second_dword = ntoh24(hdr->dlength);
        cmd_pdu_header.cmd_sn = be32_to_cpu(hdr->cmdsn);
-       cmd_pdu_header.opcode = hdr->opcode;
+       cmd_pdu_header.hdr_first_byte = hdr->opcode;
        qedi_cpy_scsi_cdb(sc, (u32 *)cmd_pdu_header.cdb);
 
        /* Fill tx AHS and rx buffer */

diff --git a/drivers/scsi/qedi/qedi_iscsi.c b/drivers/scsi/qedi/qedi_iscsi.c
index 1386bd3d4849d0ec78de8449783c9815f9c37514..d002331e716950146a0a0a4f34edcb65dbd4ee0f 100644 (file)
--- a/drivers/scsi/qedi/qedi_iscsi.c
+++ b/drivers/scsi/qedi/qedi_iscsi.c
@@ -1460,9 +1460,6 @@ static const struct {
        { ISCSI_CONN_ERROR_OUT_OF_SGES_ERROR,
          "out of sge error"
        },
-       { ISCSI_CONN_ERROR_TCP_SEG_PROC_IP_OPTIONS_ERROR,
-         "tcp seg ip options error"
-       },
        { ISCSI_CONN_ERROR_TCP_IP_FRAGMENT_ERROR,
          "tcp ip fragment error"
        },

diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
index 7fa264b20da165b9923ed5a4089d4e2b7d055f7e..425b32dcfabce8008c74874eb703c285af8798f2 100644 (file)
--- a/drivers/scsi/qedi/qedi_main.c
+++ b/drivers/scsi/qedi/qedi_main.c
@@ -1870,7 +1870,7 @@ static int __qedi_probe(struct pci_dev *pdev, int mode)
                  qedi->mac);
 
        sprintf(host_buf, "host_%d", qedi->shost->host_no);
-       qedi_ops->common->set_id(qedi->cdev, host_buf, QEDI_MODULE_VERSION);
+       qedi_ops->common->set_name(qedi->cdev, host_buf);
 
        qedi_ops->register_ops(qedi->cdev, &qedi_cb_ops, qedi);