diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:45 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:45 +0100 |
commit | dafe3258c5449e2697097285c37c761915053eae (patch) | |
tree | 3132efe10ff5766feae3311993cd7eef7e75d6f3 /net/core/sysctl_net_core.c | |
parent | 15812f79511f4b94ee42f35c9095ba0c0cb5204c (diff) | |
parent | 4ed4d44eb2192604716226a6f0edad02ab76101f (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-13.09
Diffstat (limited to 'net/core/sysctl_net_core.c')
-rw-r--r-- | net/core/sysctl_net_core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index cfdb46ab3a7f..2ff093b7c45e 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c @@ -20,7 +20,9 @@ #include <net/sock.h> #include <net/net_ratelimit.h> +static int zero = 0; static int one = 1; +static int ushort_max = USHRT_MAX; #ifdef CONFIG_RPS static int rps_sock_flow_sysctl(ctl_table *table, int write, @@ -204,7 +206,9 @@ static struct ctl_table netns_core_table[] = { .data = &init_net.core.sysctl_somaxconn, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec + .extra1 = &zero, + .extra2 = &ushort_max, + .proc_handler = proc_dointvec_minmax }, { } }; |