diff options
author | John Soni Jose <sony.john-n@emulex.com> | 2012-10-19 19:13:03 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-11-26 23:59:37 -0500 |
commit | 8359c79b3b89e97b7d4ef656915c1378069cfa93 (patch) | |
tree | a8aab363116abdbf4aebce6de66d33f8cb9f4418 /drivers/scsi/be2iscsi/be_iscsi.c | |
parent | 72fb46a9d5ec2dfe4dc65eb3bfb795510aacbd1f (diff) |
[SCSI] be2iscsi: Fix return value and typo.
Fix return value and typo in the message displayed.
Fix the goto label when wrb_hanlde allocation fails.
Fix the error message display in beiscsi_alloc_pdu
Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/be2iscsi/be_iscsi.c')
-rw-r--r-- | drivers/scsi/be2iscsi/be_iscsi.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c index aedb0d9a9dae..3f41fc0b5712 100644 --- a/drivers/scsi/be2iscsi/be_iscsi.c +++ b/drivers/scsi/be2iscsi/be_iscsi.c | |||
@@ -531,9 +531,9 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba, | |||
531 | break; | 531 | break; |
532 | case ISCSI_NET_PARAM_IPV4_BOOTPROTO: | 532 | case ISCSI_NET_PARAM_IPV4_BOOTPROTO: |
533 | if (!if_info.dhcp_state) | 533 | if (!if_info.dhcp_state) |
534 | len = sprintf(buf, "static"); | 534 | len = sprintf(buf, "static\n"); |
535 | else | 535 | else |
536 | len = sprintf(buf, "dhcp"); | 536 | len = sprintf(buf, "dhcp\n"); |
537 | break; | 537 | break; |
538 | case ISCSI_NET_PARAM_IPV4_SUBNET: | 538 | case ISCSI_NET_PARAM_IPV4_SUBNET: |
539 | len = sprintf(buf, "%pI4\n", &if_info.ip_addr.subnet_mask); | 539 | len = sprintf(buf, "%pI4\n", &if_info.ip_addr.subnet_mask); |
@@ -541,7 +541,7 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba, | |||
541 | case ISCSI_NET_PARAM_VLAN_ENABLED: | 541 | case ISCSI_NET_PARAM_VLAN_ENABLED: |
542 | len = sprintf(buf, "%s\n", | 542 | len = sprintf(buf, "%s\n", |
543 | (if_info.vlan_priority == BEISCSI_VLAN_DISABLE) | 543 | (if_info.vlan_priority == BEISCSI_VLAN_DISABLE) |
544 | ? "Disabled" : "Enabled"); | 544 | ? "Disabled\n" : "Enabled\n"); |
545 | break; | 545 | break; |
546 | case ISCSI_NET_PARAM_VLAN_ID: | 546 | case ISCSI_NET_PARAM_VLAN_ID: |
547 | if (if_info.vlan_priority == BEISCSI_VLAN_DISABLE) | 547 | if (if_info.vlan_priority == BEISCSI_VLAN_DISABLE) |
@@ -586,7 +586,7 @@ int be2iscsi_iface_get_param(struct iscsi_iface *iface, | |||
586 | len = be2iscsi_get_if_param(phba, iface, param, buf); | 586 | len = be2iscsi_get_if_param(phba, iface, param, buf); |
587 | break; | 587 | break; |
588 | case ISCSI_NET_PARAM_IFACE_ENABLE: | 588 | case ISCSI_NET_PARAM_IFACE_ENABLE: |
589 | len = sprintf(buf, "enabled"); | 589 | len = sprintf(buf, "enabled\n"); |
590 | break; | 590 | break; |
591 | case ISCSI_NET_PARAM_IPV4_GW: | 591 | case ISCSI_NET_PARAM_IPV4_GW: |
592 | memset(&gateway, 0, sizeof(gateway)); | 592 | memset(&gateway, 0, sizeof(gateway)); |
@@ -731,7 +731,6 @@ static int beiscsi_get_initname(char *buf, struct beiscsi_hba *phba) | |||
731 | * beiscsi_get_port_state - Get the Port State | 731 | * beiscsi_get_port_state - Get the Port State |
732 | * @shost : pointer to scsi_host structure | 732 | * @shost : pointer to scsi_host structure |
733 | * | 733 | * |
734 | * returns number of bytes | ||
735 | */ | 734 | */ |
736 | static void beiscsi_get_port_state(struct Scsi_Host *shost) | 735 | static void beiscsi_get_port_state(struct Scsi_Host *shost) |
737 | { | 736 | { |
@@ -1150,8 +1149,8 @@ beiscsi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr, | |||
1150 | 1149 | ||
1151 | if (phba->state != BE_ADAPTER_UP) { | 1150 | if (phba->state != BE_ADAPTER_UP) { |
1152 | ret = -EBUSY; | 1151 | ret = -EBUSY; |
1153 | beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_CONFIG, | 1152 | beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_CONFIG, |
1154 | "BS_%d : The Adapter state is Not UP\n"); | 1153 | "BS_%d : The Adapter Port state is Down!!!\n"); |
1155 | return ERR_PTR(ret); | 1154 | return ERR_PTR(ret); |
1156 | } | 1155 | } |
1157 | 1156 | ||