diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /include/net/scm.h | |
parent | 0fc72b81d3111d114ab378935b1cf07680ca1289 (diff) | |
parent | f695baf2df9e0413d3521661070103711545207a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/scm.h')
-rw-r--r-- | include/net/scm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/scm.h b/include/net/scm.h index 5637d5e22d5f..423cb1d5ac25 100644 --- a/include/net/scm.h +++ b/include/net/scm.h | |||
@@ -8,7 +8,7 @@ | |||
8 | /* Well, we should have at least one descriptor open | 8 | /* Well, we should have at least one descriptor open |
9 | * to accept passed FDs 8) | 9 | * to accept passed FDs 8) |
10 | */ | 10 | */ |
11 | #define SCM_MAX_FD (OPEN_MAX-1) | 11 | #define SCM_MAX_FD 255 |
12 | 12 | ||
13 | struct scm_fp_list | 13 | struct scm_fp_list |
14 | { | 14 | { |