3 files changed, 18 insertions, 19 deletions

diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index fd284ff36ecf..86162811812d 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -914,7 +914,7 @@ void beiscsi_conn_get_stats(struct iscsi_cls_conn *cls_conn,
         stats->r2t_pdus = conn->r2t_pdus_cnt;
         stats->digest_err = 0;
         stats->timeout_err = 0;
-        stats->custom_length = 0;
+        stats->custom_length = 1;
         strcpy(stats->custom[0].desc, "eh_abort_cnt");
         stats->custom[0].value = conn->eh_abort_cnt;
 }
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 56467df3d6de..915c26b23ab6 100644
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -539,7 +539,7 @@ static umode_t beiscsi_eth_get_attr_visibility(void *data, int type)
 }
 
 /*------------------- PCI Driver operations and data ----------------- */
-static DEFINE_PCI_DEVICE_TABLE(beiscsi_pci_id_table) = {
+static const struct pci_device_id beiscsi_pci_id_table[] = {
         { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
         { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
         { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
@@ -3538,10 +3538,9 @@ static int be_queue_alloc(struct beiscsi_hba *phba, struct be_queue_info *q,
         q->len = len;
         q->entry_size = entry_size;
         mem->size = len * entry_size;
-        mem->va = pci_alloc_consistent(phba->pcidev, mem->size, &mem->dma);
+        mem->va = pci_zalloc_consistent(phba->pcidev, mem->size, &mem->dma);
         if (!mem->va)
                 return -ENOMEM;
-        memset(mem->va, 0, mem->size);
         return 0;
 }
 
@@ -4320,9 +4319,9 @@ static int beiscsi_get_boot_info(struct beiscsi_hba *phba)
                             "BM_%d : No boot session\n");
                 return ret;
         }
-        nonemb_cmd.va = pci_alloc_consistent(phba->ctrl.pdev,
-                                sizeof(*session_resp),
-                                &nonemb_cmd.dma);
+        nonemb_cmd.va = pci_zalloc_consistent(phba->ctrl.pdev,
+                                              sizeof(*session_resp),
+                                              &nonemb_cmd.dma);
         if (nonemb_cmd.va == NULL) {
                 beiscsi_log(phba, KERN_ERR,
                             BEISCSI_LOG_INIT | BEISCSI_LOG_CONFIG,
@@ -4332,7 +4331,6 @@ static int beiscsi_get_boot_info(struct beiscsi_hba *phba)
                 return -ENOMEM;
         }
 
-        memset(nonemb_cmd.va, 0, sizeof(*session_resp));
         tag = mgmt_get_session_info(phba, s_handle,
                                     &nonemb_cmd);
         if (!tag) {
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c
index 07934b0b9ee1..665afcb74a56 100644
--- a/drivers/scsi/be2iscsi/be_mgmt.c
+++ b/drivers/scsi/be2iscsi/be_mgmt.c
@@ -900,13 +900,12 @@ free_cmd:
 static int mgmt_alloc_cmd_data(struct beiscsi_hba *phba, struct be_dma_mem *cmd,
                                int iscsi_cmd, int size)
 {
-        cmd->va = pci_alloc_consistent(phba->ctrl.pdev, size, &cmd->dma);
+        cmd->va = pci_zalloc_consistent(phba->ctrl.pdev, size, &cmd->dma);
         if (!cmd->va) {
                 beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG,
                             "BG_%d : Failed to allocate memory for if info\n");
                 return -ENOMEM;
         }
-        memset(cmd->va, 0, size);
         cmd->size = size;
         be_cmd_hdr_prepare(cmd->va, CMD_SUBSYSTEM_ISCSI, iscsi_cmd, size);
         return 0;
@@ -1015,7 +1014,7 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                 if (if_info->dhcp_state) {
                         beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_CONFIG,
                                     "BG_%d : DHCP Already Enabled\n");
-                        return 0;
+                        goto exit;
                 }
                 /* The ip_param->len is 1 in DHCP case. Setting
                    proper IP len as this it is used while
@@ -1033,7 +1032,7 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                                 sizeof(*reldhcp));
 
                         if (rc)
-                                return rc;
+                                goto exit;
 
                         reldhcp = nonemb_cmd.va;
                         reldhcp->interface_hndl = phba->interface_handle;
@@ -1044,7 +1043,7 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                                 beiscsi_log(phba, KERN_WARNING,
                                             BEISCSI_LOG_CONFIG,
                                             "BG_%d : Failed to Delete existing dhcp\n");
-                                return rc;
+                                goto exit;
                         }
                 }
         }
@@ -1054,7 +1053,7 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                 rc = mgmt_static_ip_modify(phba, if_info, ip_param, NULL,
                                            IP_ACTION_DEL);
                 if (rc)
-                        return rc;
+                        goto exit;
         }
 
         /* Delete the Gateway settings if mode change is to DHCP */
@@ -1064,7 +1063,7 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                 if (rc) {
                         beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_CONFIG,
                                     "BG_%d : Failed to Get Gateway Addr\n");
-                        return rc;
+                        goto exit;
                 }
 
                 if (gtway_addr_set.ip_addr.addr[0]) {
@@ -1076,7 +1075,7 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                                 beiscsi_log(phba, KERN_WARNING,
                                             BEISCSI_LOG_CONFIG,
                                             "BG_%d : Failed to clear Gateway Addr Set\n");
-                                return rc;
+                                goto exit;
                         }
                 }
         }
@@ -1087,7 +1086,7 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                         OPCODE_COMMON_ISCSI_NTWK_CONFIG_STATELESS_IP_ADDR,
                         sizeof(*dhcpreq));
                 if (rc)
-                        return rc;
+                        goto exit;
 
                 dhcpreq = nonemb_cmd.va;
                 dhcpreq->flags = BLOCKING;
@@ -1095,12 +1094,14 @@ int mgmt_set_ip(struct beiscsi_hba *phba,
                 dhcpreq->interface_hndl = phba->interface_handle;
                 dhcpreq->ip_type = BE2_DHCP_V4;
 
-                return mgmt_exec_nonemb_cmd(phba, &nonemb_cmd, NULL, 0);
+                rc = mgmt_exec_nonemb_cmd(phba, &nonemb_cmd, NULL, 0);
         } else {
-                return mgmt_static_ip_modify(phba, if_info, ip_param,
+                rc = mgmt_static_ip_modify(phba, if_info, ip_param,
                                              subnet_param, IP_ACTION_ADD);
         }
 
+exit:
+        kfree(if_info);
         return rc;
 }