diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/unix/af_unix.c | 6 | ||||
-rw-r--r-- | net/unix/sysctl_net_unix.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index a0aa6d3c2c08..73620d61762b 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
@@ -117,8 +117,6 @@ | |||
117 | #include <net/checksum.h> | 117 | #include <net/checksum.h> |
118 | #include <linux/security.h> | 118 | #include <linux/security.h> |
119 | 119 | ||
120 | int sysctl_unix_max_dgram_qlen __read_mostly = 10; | ||
121 | |||
122 | static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1]; | 120 | static struct hlist_head unix_socket_table[UNIX_HASH_SIZE + 1]; |
123 | static DEFINE_SPINLOCK(unix_table_lock); | 121 | static DEFINE_SPINLOCK(unix_table_lock); |
124 | static atomic_t unix_nr_socks = ATOMIC_INIT(0); | 122 | static atomic_t unix_nr_socks = ATOMIC_INIT(0); |
@@ -594,7 +592,7 @@ static struct sock * unix_create1(struct net *net, struct socket *sock) | |||
594 | &af_unix_sk_receive_queue_lock_key); | 592 | &af_unix_sk_receive_queue_lock_key); |
595 | 593 | ||
596 | sk->sk_write_space = unix_write_space; | 594 | sk->sk_write_space = unix_write_space; |
597 | sk->sk_max_ack_backlog = sysctl_unix_max_dgram_qlen; | 595 | sk->sk_max_ack_backlog = net->sysctl_unix_max_dgram_qlen; |
598 | sk->sk_destruct = unix_sock_destructor; | 596 | sk->sk_destruct = unix_sock_destructor; |
599 | u = unix_sk(sk); | 597 | u = unix_sk(sk); |
600 | u->dentry = NULL; | 598 | u->dentry = NULL; |
@@ -2140,6 +2138,8 @@ static int unix_net_init(struct net *net) | |||
2140 | { | 2138 | { |
2141 | int error = -ENOMEM; | 2139 | int error = -ENOMEM; |
2142 | 2140 | ||
2141 | net->sysctl_unix_max_dgram_qlen = 10; | ||
2142 | |||
2143 | #ifdef CONFIG_PROC_FS | 2143 | #ifdef CONFIG_PROC_FS |
2144 | if (!proc_net_fops_create(net, "unix", 0, &unix_seq_fops)) | 2144 | if (!proc_net_fops_create(net, "unix", 0, &unix_seq_fops)) |
2145 | goto out; | 2145 | goto out; |
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index b2e0407e1b7b..c46cec04d23f 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c | |||
@@ -18,7 +18,7 @@ static ctl_table unix_table[] = { | |||
18 | { | 18 | { |
19 | .ctl_name = NET_UNIX_MAX_DGRAM_QLEN, | 19 | .ctl_name = NET_UNIX_MAX_DGRAM_QLEN, |
20 | .procname = "max_dgram_qlen", | 20 | .procname = "max_dgram_qlen", |
21 | .data = &sysctl_unix_max_dgram_qlen, | 21 | .data = &init_net.sysctl_unix_max_dgram_qlen, |
22 | .maxlen = sizeof(int), | 22 | .maxlen = sizeof(int), |
23 | .mode = 0644, | 23 | .mode = 0644, |
24 | .proc_handler = &proc_dointvec | 24 | .proc_handler = &proc_dointvec |