diff options
author | David S. Miller <davem@davemloft.net> | 2017-01-11 22:43:39 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-11 22:43:39 +0300 |
commit | 02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch) | |
tree | 08a39341379ce6f1ad4f3997df36c76ee82cee9c /net/ipv4/sysctl_net_ipv4.c | |
parent | 265592a1dfc31ecab02a960721a1f137e50afb17 (diff) | |
parent | ba836a6f5ab1243ff5e08a941a2d1de8b31244e1 (diff) | |
download | linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables
at the same time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
-rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 134d8e191366..0f2d37e8e983 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c @@ -930,7 +930,7 @@ static struct ctl_table ipv4_net_table[] = { .data = &init_net.ipv4.sysctl_tcp_notsent_lowat, .maxlen = sizeof(unsigned int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_douintvec, }, { .procname = "tcp_tw_reuse", |