diff options
| author | Vikas Chaudhary <vikas.chaudhary@qlogic.com> | 2011-07-25 13:48:39 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-08-27 08:35:59 -0600 |
| commit | 2bab08fc770ccd6c56859371356a4a905e8c0bd4 (patch) | |
| tree | 03f6f260135452ac8d94e416478d0b8f8e140e36 /drivers/scsi/qla4xxx/ql4_os.c | |
| parent | d00efe3fa87fdf1df3635ba57ef3f14d03bc3ac8 (diff) | |
[SCSI] qla4xxx: Added new "struct ipaddress_config"
- Move all ipaddress related param to "struct ipaddress_config"
from "struct scsi_qla_host"
- update function - qla4xxx_update_local_ip()
- Rename IPOPT_IPv4_PROTOCOL_ENABLE to IPOPT_IPV4_PROTOCOL_ENABLE
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
[update for new ISCSI_IFACE values]
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_os.c')
| -rw-r--r-- | drivers/scsi/qla4xxx/ql4_os.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 586f12f17c3..21e4f858d72 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c @@ -191,9 +191,7 @@ static int qla4xxx_host_get_param(struct Scsi_Host *shost, len = sysfs_format_mac(buf, ha->my_mac, MAC_ADDR_LEN); break; case ISCSI_HOST_PARAM_IPADDRESS: - len = sprintf(buf, "%d.%d.%d.%d\n", ha->ip_address[0], - ha->ip_address[1], ha->ip_address[2], - ha->ip_address[3]); + len = sprintf(buf, "%pI4\n", &ha->ip_config.ip_address); break; case ISCSI_HOST_PARAM_INITIATOR_NAME: len = sprintf(buf, "%s\n", ha->name_string); @@ -330,10 +328,10 @@ static void qla4xxx_set_ipv4(struct scsi_qla_host *ha, case ISCSI_NET_PARAM_IFACE_ENABLE: if (iface_param->value[0] == ISCSI_IFACE_ENABLE) init_fw_cb->ipv4_ip_opts |= - cpu_to_le16(IPOPT_IPv4_PROTOCOL_ENABLE); + cpu_to_le16(IPOPT_IPV4_PROTOCOL_ENABLE); else init_fw_cb->ipv4_ip_opts &= - cpu_to_le16(~IPOPT_IPv4_PROTOCOL_ENABLE & + cpu_to_le16(~IPOPT_IPV4_PROTOCOL_ENABLE & 0xFFFF); break; case ISCSI_NET_PARAM_VLAN_ID: |