Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[~andy/linux] / drivers / scsi / libiscsi.c

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 86153e087e8106ee9ba1546d0b0053b416ad9b06..e3995612ea7602c231815fb5425a7f1cacb5192f 100644 (file)
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -3170,6 +3170,7 @@ int iscsi_set_param(struct iscsi_cls_conn *cls_conn,
 {
        struct iscsi_conn *conn = cls_conn->dd_data;
        struct iscsi_session *session = conn->session;
+       int val;
 
        switch(param) {
        case ISCSI_PARAM_FAST_ABORT:
@@ -3264,6 +3265,10 @@ int iscsi_set_param(struct iscsi_cls_conn *cls_conn,
        case ISCSI_PARAM_DISCOVERY_PARENT_TYPE:
                return iscsi_switch_str_param(&session->discovery_parent_type,
                                              buf);
+       case ISCSI_PARAM_DISCOVERY_SESS:
+               sscanf(buf, "%d", &val);
+               session->discovery_sess = !!val;
+               break;
        default:
                return -ENOSYS;
        }
@@ -3312,6 +3317,9 @@ int iscsi_session_get_param(struct iscsi_cls_session *cls_session,
        case ISCSI_PARAM_DATASEQ_INORDER_EN:
                len = sprintf(buf, "%d\n", session->dataseq_inorder_en);
                break;
+       case ISCSI_PARAM_DEF_TASKMGMT_TMO:
+               len = sprintf(buf, "%d\n", session->def_taskmgmt_tmo);
+               break;
        case ISCSI_PARAM_ERL:
                len = sprintf(buf, "%d\n", session->erl);
                break;
@@ -3350,6 +3358,7 @@ int iscsi_session_get_param(struct iscsi_cls_session *cls_session,
                break;
        case ISCSI_PARAM_BOOT_TARGET:
                len = sprintf(buf, "%s\n", session->boot_target);
+               break;
        case ISCSI_PARAM_AUTO_SND_TGT_DISABLE:
                len = sprintf(buf, "%u\n", session->auto_snd_tgt_disable);
                break;
@@ -3521,6 +3530,9 @@ int iscsi_conn_get_param(struct iscsi_cls_conn *cls_conn,
        case ISCSI_PARAM_IPV6_TC:
                len = sprintf(buf, "%u\n", conn->ipv6_traffic_class);
                break;
+       case ISCSI_PARAM_IPV6_FLOW_LABEL:
+               len = sprintf(buf, "%u\n", conn->ipv6_flow_label);
+               break;
        case ISCSI_PARAM_IS_FW_ASSIGNED_IPV6:
                len = sprintf(buf, "%u\n", conn->is_fw_assigned_ipv6);
                break;