aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/qla4xxx/ql4_os.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/qla4xxx/ql4_os.c')
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 586f12f17c33..21e4f858d72b 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,
191 len = sysfs_format_mac(buf, ha->my_mac, MAC_ADDR_LEN); 191 len = sysfs_format_mac(buf, ha->my_mac, MAC_ADDR_LEN);
192 break; 192 break;
193 case ISCSI_HOST_PARAM_IPADDRESS: 193 case ISCSI_HOST_PARAM_IPADDRESS:
194 len = sprintf(buf, "%d.%d.%d.%d\n", ha->ip_address[0], 194 len = sprintf(buf, "%pI4\n", &ha->ip_config.ip_address);
195 ha->ip_address[1], ha->ip_address[2],
196 ha->ip_address[3]);
197 break; 195 break;
198 case ISCSI_HOST_PARAM_INITIATOR_NAME: 196 case ISCSI_HOST_PARAM_INITIATOR_NAME:
199 len = sprintf(buf, "%s\n", ha->name_string); 197 len = sprintf(buf, "%s\n", ha->name_string);
@@ -330,10 +328,10 @@ static void qla4xxx_set_ipv4(struct scsi_qla_host *ha,
330 case ISCSI_NET_PARAM_IFACE_ENABLE: 328 case ISCSI_NET_PARAM_IFACE_ENABLE:
331 if (iface_param->value[0] == ISCSI_IFACE_ENABLE) 329 if (iface_param->value[0] == ISCSI_IFACE_ENABLE)
332 init_fw_cb->ipv4_ip_opts |= 330 init_fw_cb->ipv4_ip_opts |=
333 cpu_to_le16(IPOPT_IPv4_PROTOCOL_ENABLE); 331 cpu_to_le16(IPOPT_IPV4_PROTOCOL_ENABLE);
334 else 332 else
335 init_fw_cb->ipv4_ip_opts &= 333 init_fw_cb->ipv4_ip_opts &=
336 cpu_to_le16(~IPOPT_IPv4_PROTOCOL_ENABLE & 334 cpu_to_le16(~IPOPT_IPV4_PROTOCOL_ENABLE &
337 0xFFFF); 335 0xFFFF);
338 break; 336 break;
339 case ISCSI_NET_PARAM_VLAN_ID: 337 case ISCSI_NET_PARAM_VLAN_ID: