diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-11-04 12:38:23 -0500 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-04 12:38:23 -0500 |
| commit | 622d32d3ec40d5075523656ef0ea836f6a595ae3 (patch) | |
| tree | d4c82d4f90ca0deb8fa806f105e204f2bdac2377 /include | |
| parent | 476d42f138ba82389a92a894d8a630a70d36278f (diff) | |
| parent | ed814525f2e45188964c270fc3a5a0b644f7e4a9 (diff) | |
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 233db5c18b86..18942ad115d9 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | extern const char *drbd_buildtag(void); | 55 | extern const char *drbd_buildtag(void); |
| 56 | #define REL_VERSION "8.3.3rc2" | 56 | #define REL_VERSION "8.3.5" |
| 57 | #define API_VERSION 88 | 57 | #define API_VERSION 88 |
| 58 | #define PRO_VERSION_MIN 86 | 58 | #define PRO_VERSION_MIN 86 |
| 59 | #define PRO_VERSION_MAX 91 | 59 | #define PRO_VERSION_MAX 91 |
diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h index 9d067ce46960..51f47a586ad8 100644 --- a/include/linux/drbd_limits.h +++ b/include/linux/drbd_limits.h | |||
| @@ -70,11 +70,11 @@ | |||
| 70 | /* I don't think that a tcp send buffer of more than 10M is usefull */ | 70 | /* I don't think that a tcp send buffer of more than 10M is usefull */ |
| 71 | #define DRBD_SNDBUF_SIZE_MIN 0 | 71 | #define DRBD_SNDBUF_SIZE_MIN 0 |
| 72 | #define DRBD_SNDBUF_SIZE_MAX (10<<20) | 72 | #define DRBD_SNDBUF_SIZE_MAX (10<<20) |
| 73 | #define DRBD_SNDBUF_SIZE_DEF (2*65535) | 73 | #define DRBD_SNDBUF_SIZE_DEF 0 |
| 74 | 74 | ||
| 75 | #define DRBD_RCVBUF_SIZE_MIN 0 | 75 | #define DRBD_RCVBUF_SIZE_MIN 0 |
| 76 | #define DRBD_RCVBUF_SIZE_MAX (10<<20) | 76 | #define DRBD_RCVBUF_SIZE_MAX (10<<20) |
| 77 | #define DRBD_RCVBUF_SIZE_DEF (2*65535) | 77 | #define DRBD_RCVBUF_SIZE_DEF 0 |
| 78 | 78 | ||
| 79 | /* @4k PageSize -> 128kB - 512MB */ | 79 | /* @4k PageSize -> 128kB - 512MB */ |
| 80 | #define DRBD_MAX_BUFFERS_MIN 32 | 80 | #define DRBD_MAX_BUFFERS_MIN 32 |