diff options
| author | Jeff Garzik <jgarzik@redhat.com> | 2004-02-17 10:03:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2004-02-17 10:03:31 -0500 |
| commit | 0b37a9199bf44bba96aa24b9edbc1c2bb72bec1d (patch) | |
| tree | aad525268a3f61a36ecedb66078ab9b0902272c6 /include/linux/sysctl.h | |
| parent | 0c92609a946c935ca95af41f13e999dca5eec42e (diff) | |
| parent | d6c561cedcbd025198ce21731ccc1eae70e10a3d (diff) | |
Hand-merge pc300_tty.c conflicts with netdev.
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 2 |
1 files changed, 2 insertions, 0 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 */ |