Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / net / rxrpc / sysctl.c

diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c
index 03ad08774d4e81a9d44a2c8fb2b7dd3aa0739d8d..b7ca8cf13c849b5a7f0b7509683bb8db4a171c9c 100644 (file)
--- a/net/rxrpc/sysctl.c
+++ b/net/rxrpc/sysctl.c
@@ -62,6 +62,22 @@ static struct ctl_table rxrpc_sysctl_table[] = {
                .proc_handler   = proc_dointvec_ms_jiffies,
                .extra1         = (void *)&one,
        },
+       {
+               .procname       = "idle_conn_expiry",
+               .data           = &rxrpc_conn_idle_client_expiry,
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec_ms_jiffies,
+               .extra1         = (void *)&one,
+       },
+       {
+               .procname       = "idle_conn_fast_expiry",
+               .data           = &rxrpc_conn_idle_client_fast_expiry,
+               .maxlen         = sizeof(unsigned int),
+               .mode           = 0644,
+               .proc_handler   = proc_dointvec_ms_jiffies,
+               .extra1         = (void *)&one,
+       },
 
        /* Values measured in seconds but used in jiffies */
        {
@@ -72,26 +88,25 @@ static struct ctl_table rxrpc_sysctl_table[] = {
                .proc_handler   = proc_dointvec_jiffies,
                .extra1         = (void *)&one,
        },
+
+       /* Non-time values */
        {
-               .procname       = "dead_call_expiry",
-               .data           = &rxrpc_dead_call_expiry,
+               .procname       = "max_client_conns",
+               .data           = &rxrpc_max_client_connections,
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
-               .proc_handler   = proc_dointvec_jiffies,
-               .extra1         = (void *)&one,
+               .proc_handler   = proc_dointvec_minmax,
+               .extra1         = (void *)&rxrpc_reap_client_connections,
        },
-
-       /* Values measured in seconds */
        {
-               .procname       = "connection_expiry",
-               .data           = &rxrpc_connection_expiry,
+               .procname       = "reap_client_conns",
+               .data           = &rxrpc_reap_client_connections,
                .maxlen         = sizeof(unsigned int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec_minmax,
                .extra1         = (void *)&one,
+               .extra2         = (void *)&rxrpc_max_client_connections,
        },
-
-       /* Non-time values */
        {
                .procname       = "max_backlog",
                .data           = &rxrpc_max_backlog,