From: Daniel Stodden <daniel.stodden@citrix.com>
Date: Fri, 23 Apr 2010 21:59:24 +0000 (-0700)
Subject: CA-40696: Use system macros for fd set sizes.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c404204bf2df94e4bad9dcf87597d827bec53e0c;p=people%2Fdstodden%2Fblktap.git

CA-40696: Use system macros for fd set sizes.
---

diff --git a/daemon/tapdisk-dispatch.h b/daemon/tapdisk-dispatch.h
index 9ae7782..c91f528 100644
--- a/daemon/tapdisk-dispatch.h
+++ b/daemon/tapdisk-dispatch.h
@@ -28,16 +28,18 @@
 #ifndef _TAPDISK_DISPATCH_H_
 #define _TAPDISK_DISPATCH_H_
 
+#include <sys/select.h>
+
 #include "xs_api.h"
 #include "blktaplib.h"
 #include "tapdisk-message.h"
 
 /*
  * This goes below MAX_TAP_DEV, bound by our ipc architecture and
- * fd_set size (1024 bits, minus room for misc). Named pipes are
+ * fd_set size (typically 1024, minus room for misc). Named pipes are
  * simplex. Socketpairs might might have been a better choice.
  */
-#define TAPDISK_DAEMON_MAX_CHANNELS   ((1024 - 16) / 2)
+#define TAPDISK_DAEMON_MAX_CHANNELS   ((FD_SETSIZE - 16) / 2)
 
 typedef enum {
 	TAPDISK_CHANNEL_DEAD          = 1,