diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-02-06 03:38:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-02-06 03:38:04 -0800 |
| commit | 519b996bce07eb79e65548abf7591231c55a0d32 (patch) | |
| tree | c2c5a66284c735786ae0bc60369563990587cf0c /include | |
| parent | 774bf41565f413587099ae1240c1eb9159face77 (diff) | |
| parent | eb0a397cf3697c69a136bfb09f17c8514700c855 (diff) | |
Merge http://linux-lksctp.bkbits.net/lksctp-2.5.work
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sysctl.h | 2 | ||||
| -rw-r--r-- | include/net/sctp/constants.h | 2 | ||||
| -rw-r--r-- | include/net/sctp/structs.h | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 935be9d21b69..dc4167a0dbf2 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -583,6 +583,8 @@ enum { NET_SCTP_PRESERVE_ENABLE = 11, NET_SCTP_MAX_BURST = 12, NET_SCTP_ADDIP_ENABLE = 13, + NET_SCTP_RMEM = 14, + NET_SCTP_WMEM = 15, }; /* /proc/sys/net/bridge */ diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h index f031313bb3ef..6112e85f7a9c 100644 --- a/include/net/sctp/constants.h +++ b/include/net/sctp/constants.h @@ -323,7 +323,7 @@ typedef enum { #define SCTP_DEFAULT_COOKIE_LIFE_USEC 0 /* microseconds */ #define SCTP_DEFAULT_MINWINDOW 1500 /* default minimum rwnd size */ -#define SCTP_DEFAULT_MAXWINDOW 32768 /* default rwnd size */ +#define SCTP_DEFAULT_MAXWINDOW 65535 /* default rwnd size */ #define SCTP_DEFAULT_MAXSEGMENT 1500 /* MTU size, this is the limit * to which we will raise the P-MTU. */ diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index a36880e6733f..ee24aa0e76c3 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -193,6 +193,10 @@ extern struct sctp_globals { /* Flag to indicate if addip is enabled. */ int addip_enable; + + /* socket receive and send buffer sizes. */ + int rmem; + int wmem; } sctp_globals; #define sctp_rto_initial (sctp_globals.rto_initial) @@ -221,6 +225,8 @@ extern struct sctp_globals { #define sctp_local_addr_list (sctp_globals.local_addr_list) #define sctp_local_addr_lock (sctp_globals.local_addr_lock) #define sctp_addip_enable (sctp_globals.addip_enable) +#define sctp_rmem (sctp_globals.rmem) +#define sctp_wmem (sctp_globals.wmem) /* SCTP Socket type: UDP or TCP style. */ typedef enum { |