Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[pandora-kernel.git] / include / net / scm.h

diff --git a/include/net/scm.h b/include/net/scm.h
index 5637d5e..423cb1d 100644 (file)
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -8,7 +8,7 @@
 /* Well, we should have at least one descriptor open
  * to accept passed FDs 8)
  */
-#define SCM_MAX_FD     (OPEN_MAX-1)
+#define SCM_MAX_FD     255
 
 struct scm_fp_list
 {