diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:39:43 -0500 |
| commit | b2576e1d4408e134e2188c967b1f28af39cd79d4 (patch) | |
| tree | 004f3c82faab760f304ce031d6d2f572e7746a50 /net/unix/sysctl_net_unix.c | |
| parent | 3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77 (diff) | |
| parent | 2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f (diff) | |
Merge branch 'linus' into release
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
| -rw-r--r-- | net/unix/sysctl_net_unix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c index 77513d7e35f2..83c093077ebc 100644 --- a/net/unix/sysctl_net_unix.c +++ b/net/unix/sysctl_net_unix.c | |||
| @@ -21,7 +21,7 @@ static ctl_table unix_table[] = { | |||
| 21 | .data = &init_net.unx.sysctl_max_dgram_qlen, | 21 | .data = &init_net.unx.sysctl_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 |
| 25 | }, | 25 | }, |
| 26 | { .ctl_name = 0 } | 26 | { .ctl_name = 0 } |
| 27 | }; | 27 | }; |
| @@ -61,4 +61,3 @@ void unix_sysctl_unregister(struct net *net) | |||
| 61 | unregister_sysctl_table(net->unx.ctl); | 61 | unregister_sysctl_table(net->unx.ctl); |
| 62 | kfree(table); | 62 | kfree(table); |
| 63 | } | 63 | } |
| 64 | |||