1 files changed, 40 insertions, 2 deletions

diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index 4faeb47fa5e1..39761837608d 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -223,6 +223,8 @@ static void iscsit_set_default_tpg_attribs(struct iscsi_portal_group *tpg)
         a->cache_dynamic_acls = TA_CACHE_DYNAMIC_ACLS;
         a->demo_mode_write_protect = TA_DEMO_MODE_WRITE_PROTECT;
         a->prod_mode_write_protect = TA_PROD_MODE_WRITE_PROTECT;
+        a->demo_mode_discovery = TA_DEMO_MODE_DISCOVERY;
+        a->default_erl = TA_DEFAULT_ERL;
 }
 
 int iscsit_tpg_add_portal_group(struct iscsi_tiqn *tiqn, struct iscsi_portal_group *tpg)
@@ -237,7 +239,7 @@ int iscsit_tpg_add_portal_group(struct iscsi_tiqn *tiqn, struct iscsi_portal_gro
         if (iscsi_create_default_params(&tpg->param_list) < 0)
                 goto err_out;
 
-        ISCSI_TPG_ATTRIB(tpg)->tpg = tpg;
+        tpg->tpg_attrib.tpg = tpg;
 
         spin_lock(&tpg->tpg_state_lock);
         tpg->tpg_state  = TPG_STATE_INACTIVE;
@@ -330,7 +332,7 @@ int iscsit_tpg_enable_portal_group(struct iscsi_portal_group *tpg)
                 return -EINVAL;
         }
 
-        if (ISCSI_TPG_ATTRIB(tpg)->authentication) {
+        if (tpg->tpg_attrib.authentication) {
                 if (!strcmp(param->value, NONE)) {
                         ret = iscsi_update_param_value(param, CHAP);
                         if (ret)
@@ -820,3 +822,39 @@ int iscsit_ta_prod_mode_write_protect(
 
         return 0;
 }
+
+int iscsit_ta_demo_mode_discovery(
+        struct iscsi_portal_group *tpg,
+        u32 flag)
+{
+        struct iscsi_tpg_attrib *a = &tpg->tpg_attrib;
+
+        if ((flag != 0) && (flag != 1)) {
+                pr_err("Illegal value %d\n", flag);
+                return -EINVAL;
+        }
+
+        a->demo_mode_discovery = flag;
+        pr_debug("iSCSI_TPG[%hu] - Demo Mode Discovery bit:"
+                " %s\n", tpg->tpgt, (a->demo_mode_discovery) ?
+                "ON" : "OFF");
+
+        return 0;
+}
+
+int iscsit_ta_default_erl(
+        struct iscsi_portal_group *tpg,
+        u32 default_erl)
+{
+        struct iscsi_tpg_attrib *a = &tpg->tpg_attrib;
+
+        if ((default_erl != 0) && (default_erl != 1) && (default_erl != 2)) {
+                pr_err("Illegal value for default_erl: %u\n", default_erl);
+                return -EINVAL;
+        }
+
+        a->default_erl = default_erl;
+        pr_debug("iSCSI_TPG[%hu] - DefaultERL: %u\n", tpg->tpgt, a->default_erl);
+
+        return 0;
+}