diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-11-04 18:38:23 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-04 18:38:23 +0100 |
| commit | 622d32d3ec40d5075523656ef0ea836f6a595ae3 (patch) | |
| tree | d4c82d4f90ca0deb8fa806f105e204f2bdac2377 /include | |
| parent | 476d42f138ba82389a92a894d8a630a70d36278f (diff) | |
| parent | ed814525f2e45188964c270fc3a5a0b644f7e4a9 (diff) | |
| download | op-kernel-dev-622d32d3ec40d5075523656ef0ea836f6a595ae3.zip op-kernel-dev-622d32d3ec40d5075523656ef0ea836f6a595ae3.tar.gz | |
Merge branch 'for-jens' of git://git.drbd.org/linux-2.6-drbd into for-2.6.33
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/drbd.h | 2 | ||||
| -rw-r--r-- | include/linux/drbd_limits.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 233db5c..18942ad 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h @@ -53,7 +53,7 @@ extern const char *drbd_buildtag(void); -#define REL_VERSION "8.3.3rc2" +#define REL_VERSION "8.3.5" #define API_VERSION 88 #define PRO_VERSION_MIN 86 #define PRO_VERSION_MAX 91 diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h index 9d067ce..51f47a5 100644 --- a/include/linux/drbd_limits.h +++ b/include/linux/drbd_limits.h @@ -70,11 +70,11 @@ /* I don't think that a tcp send buffer of more than 10M is usefull */ #define DRBD_SNDBUF_SIZE_MIN 0 #define DRBD_SNDBUF_SIZE_MAX (10<<20) -#define DRBD_SNDBUF_SIZE_DEF (2*65535) +#define DRBD_SNDBUF_SIZE_DEF 0 #define DRBD_RCVBUF_SIZE_MIN 0 #define DRBD_RCVBUF_SIZE_MAX (10<<20) -#define DRBD_RCVBUF_SIZE_DEF (2*65535) +#define DRBD_RCVBUF_SIZE_DEF 0 /* @4k PageSize -> 128kB - 512MB */ #define DRBD_MAX_BUFFERS_MIN 32 |
