diff options
author | Adheer Chandravanshi <adheer.chandravanshi@qlogic.com> | 2013-11-22 05:28:20 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-12-19 23:56:26 -0500 |
commit | 5af62f240b4bf6a79ffe71d570b7b1e2765ea0d0 (patch) | |
tree | b5f484c5a90b3647e7c7e29cca6fa2d22f9f0701 | |
parent | 4161cee52df8628c7cac1b25d404d40c4fb57363 (diff) |
[SCSI] scsi_transport_iscsi: Export ISCSI_PARAM_LOCAL_IPADDR attr for iscsi_connection
This attribute specifies the local IP address used to establish connection.
Signed-off-by: Adheer Chandravanshi <adheer.chandravanshi@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 4 | ||||
-rw-r--r-- | include/scsi/iscsi_if.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 4cf918a9fc6f..fd8ffe6bcfdd 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
@@ -3772,6 +3772,7 @@ iscsi_conn_attr(ipv6_flow_label, ISCSI_PARAM_IPV6_FLOW_LABEL); | |||
3772 | iscsi_conn_attr(is_fw_assigned_ipv6, ISCSI_PARAM_IS_FW_ASSIGNED_IPV6); | 3772 | iscsi_conn_attr(is_fw_assigned_ipv6, ISCSI_PARAM_IS_FW_ASSIGNED_IPV6); |
3773 | iscsi_conn_attr(tcp_xmit_wsf, ISCSI_PARAM_TCP_XMIT_WSF); | 3773 | iscsi_conn_attr(tcp_xmit_wsf, ISCSI_PARAM_TCP_XMIT_WSF); |
3774 | iscsi_conn_attr(tcp_recv_wsf, ISCSI_PARAM_TCP_RECV_WSF); | 3774 | iscsi_conn_attr(tcp_recv_wsf, ISCSI_PARAM_TCP_RECV_WSF); |
3775 | iscsi_conn_attr(local_ipaddr, ISCSI_PARAM_LOCAL_IPADDR); | ||
3775 | 3776 | ||
3776 | 3777 | ||
3777 | #define iscsi_conn_ep_attr_show(param) \ | 3778 | #define iscsi_conn_ep_attr_show(param) \ |
@@ -3841,6 +3842,7 @@ static struct attribute *iscsi_conn_attrs[] = { | |||
3841 | &dev_attr_conn_is_fw_assigned_ipv6.attr, | 3842 | &dev_attr_conn_is_fw_assigned_ipv6.attr, |
3842 | &dev_attr_conn_tcp_xmit_wsf.attr, | 3843 | &dev_attr_conn_tcp_xmit_wsf.attr, |
3843 | &dev_attr_conn_tcp_recv_wsf.attr, | 3844 | &dev_attr_conn_tcp_recv_wsf.attr, |
3845 | &dev_attr_conn_local_ipaddr.attr, | ||
3844 | NULL, | 3846 | NULL, |
3845 | }; | 3847 | }; |
3846 | 3848 | ||
@@ -3910,6 +3912,8 @@ static umode_t iscsi_conn_attr_is_visible(struct kobject *kobj, | |||
3910 | param = ISCSI_PARAM_TCP_XMIT_WSF; | 3912 | param = ISCSI_PARAM_TCP_XMIT_WSF; |
3911 | else if (attr == &dev_attr_conn_tcp_recv_wsf.attr) | 3913 | else if (attr == &dev_attr_conn_tcp_recv_wsf.attr) |
3912 | param = ISCSI_PARAM_TCP_RECV_WSF; | 3914 | param = ISCSI_PARAM_TCP_RECV_WSF; |
3915 | else if (attr == &dev_attr_conn_local_ipaddr.attr) | ||
3916 | param = ISCSI_PARAM_LOCAL_IPADDR; | ||
3913 | else { | 3917 | else { |
3914 | WARN_ONCE(1, "Invalid conn attr"); | 3918 | WARN_ONCE(1, "Invalid conn attr"); |
3915 | return 0; | 3919 | return 0; |
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h index 3851a737c429..fd0421c6d40a 100644 --- a/include/scsi/iscsi_if.h +++ b/include/scsi/iscsi_if.h | |||
@@ -618,6 +618,7 @@ enum iscsi_param { | |||
618 | 618 | ||
619 | ISCSI_PARAM_DISCOVERY_PARENT_IDX, | 619 | ISCSI_PARAM_DISCOVERY_PARENT_IDX, |
620 | ISCSI_PARAM_DISCOVERY_PARENT_TYPE, | 620 | ISCSI_PARAM_DISCOVERY_PARENT_TYPE, |
621 | ISCSI_PARAM_LOCAL_IPADDR, | ||
621 | /* must always be last */ | 622 | /* must always be last */ |
622 | ISCSI_PARAM_MAX, | 623 | ISCSI_PARAM_MAX, |
623 | }; | 624 | }; |