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 f75761726c7f99719a26742acc6bea05f30d2cff..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;
        }