scsi: target: iscsi: Remove the unused netif_timeout attribute

This attribute has never been used, remove it.

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
Link: https://lore.kernel.org/r/20230630155309.46061-1-mlombard@redhat.com
Reviewed-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c
index 5d0f51822414e04018bfaaf73787d4d09ae53d70..6ce967f5af1413ba79c7be0cf0b3e284c6e3da0d 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_configfs.c
+++ b/drivers/target/iscsi/iscsi_target_configfs.c
@@ -783,7 +783,6 @@ CONFIGFS_ATTR(iscsi_tpg_attrib_, name)
 
 DEF_TPG_ATTRIB(authentication);
 DEF_TPG_ATTRIB(login_timeout);
-DEF_TPG_ATTRIB(netif_timeout);
 DEF_TPG_ATTRIB(generate_node_acls);
 DEF_TPG_ATTRIB(default_cmdsn_depth);
 DEF_TPG_ATTRIB(cache_dynamic_acls);
@@ -799,7 +798,6 @@ DEF_TPG_ATTRIB(login_keys_workaround);
 static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = {
        &iscsi_tpg_attrib_attr_authentication,
        &iscsi_tpg_attrib_attr_login_timeout,
-       &iscsi_tpg_attrib_attr_netif_timeout,
        &iscsi_tpg_attrib_attr_generate_node_acls,
        &iscsi_tpg_attrib_attr_default_cmdsn_depth,
        &iscsi_tpg_attrib_attr_cache_dynamic_acls,

diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index 3cac1aafef689cf119a4943ec7fc66d922574c54..f7bac98fd4fef96f6383c88f4ac54c22efc5788c 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -211,7 +211,6 @@ static void iscsit_set_default_tpg_attribs(struct iscsi_portal_group *tpg)
 
        a->authentication = TA_AUTHENTICATION;
        a->login_timeout = TA_LOGIN_TIMEOUT;
-       a->netif_timeout = TA_NETIF_TIMEOUT;
        a->default_cmdsn_depth = TA_DEFAULT_CMDSN_DEPTH;
        a->generate_node_acls = TA_GENERATE_NODE_ACLS;
        a->cache_dynamic_acls = TA_CACHE_DYNAMIC_ACLS;
@@ -666,31 +665,6 @@ int iscsit_ta_login_timeout(
        return 0;
 }
 
-int iscsit_ta_netif_timeout(
-       struct iscsi_portal_group *tpg,
-       u32 netif_timeout)
-{
-       struct iscsi_tpg_attrib *a = &tpg->tpg_attrib;
-
-       if (netif_timeout > TA_NETIF_TIMEOUT_MAX) {
-               pr_err("Requested Network Interface Timeout %u larger"
-                       " than maximum %u\n", netif_timeout,
-                               TA_NETIF_TIMEOUT_MAX);
-               return -EINVAL;
-       } else if (netif_timeout < TA_NETIF_TIMEOUT_MIN) {
-               pr_err("Requested Network Interface Timeout %u smaller"
-                       " than minimum %u\n", netif_timeout,
-                               TA_NETIF_TIMEOUT_MIN);
-               return -EINVAL;
-       }
-
-       a->netif_timeout = netif_timeout;
-       pr_debug("Set Network Interface Timeout to %u for"
-               " Target Portal Group %hu\n", a->netif_timeout, tpg->tpgt);
-
-       return 0;
-}
-
 int iscsit_ta_generate_node_acls(
        struct iscsi_portal_group *tpg,
        u32 flag)

diff --git a/drivers/target/iscsi/iscsi_target_tpg.h b/drivers/target/iscsi/iscsi_target_tpg.h
index 839e453627769211030b5cbbdcab09e11666efdd..71d067f62177843e4dffe1f05091324f5a1f1529 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_tpg.h
+++ b/drivers/target/iscsi/iscsi_target_tpg.h
@@ -38,7 +38,6 @@ extern int iscsit_tpg_del_network_portal(struct iscsi_portal_group *,
                        struct iscsi_tpg_np *);
 extern int iscsit_ta_authentication(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_login_timeout(struct iscsi_portal_group *, u32);
-extern int iscsit_ta_netif_timeout(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_generate_node_acls(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_default_cmdsn_depth(struct iscsi_portal_group *, u32);
 extern int iscsit_ta_cache_dynamic_acls(struct iscsi_portal_group *, u32);

diff --git a/include/target/iscsi/iscsi_target_core.h b/include/target/iscsi/iscsi_target_core.h
index 4c15420e8965d25bdadf2aeb81716dba10fd1d28..60af7c63b34e6afaff10a0c25e8fc8fd843ee93b 100644 (file)
--- a/include/target/iscsi/iscsi_target_core.h
+++ b/include/target/iscsi/iscsi_target_core.h
@@ -50,9 +50,6 @@ struct sock;
 #define TA_LOGIN_TIMEOUT               15
 #define TA_LOGIN_TIMEOUT_MAX           30
 #define TA_LOGIN_TIMEOUT_MIN           5
-#define TA_NETIF_TIMEOUT               2
-#define TA_NETIF_TIMEOUT_MAX           15
-#define TA_NETIF_TIMEOUT_MIN           2
 #define TA_GENERATE_NODE_ACLS          0
 #define TA_DEFAULT_CMDSN_DEPTH         64
 #define TA_DEFAULT_CMDSN_DEPTH_MAX     512
@@ -773,7 +770,6 @@ to_iscsi_nacl(struct se_node_acl *se_nacl)
 struct iscsi_tpg_attrib {
        u32                     authentication;
        u32                     login_timeout;
-       u32                     netif_timeout;
        u32                     generate_node_acls;
        u32                     cache_dynamic_acls;
        u32                     default_cmdsn_depth;