diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-04-04 11:45:09 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-04-04 11:45:09 +0100 |
| commit | 94394e5bc92026a2ff31cd03e11e015adfdb3260 (patch) | |
| tree | 8f24a3e60e98d45ba7416821aadb84508e18d79d /include/linux/sysctl.h | |
| parent | 3f4d4f4e46865cb01d2e2717c6906e2ae079c042 (diff) | |
| parent | 5e4b50795ee8c7659a1181cea4c98712e02ea63e (diff) | |
Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5
into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 01829afb8e41..30caa40c26be 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -288,7 +288,8 @@ enum NET_TCP_ADV_WIN_SCALE=87, NET_IPV4_NONLOCAL_BIND=88, NET_IPV4_ICMP_RATELIMIT=89, - NET_IPV4_ICMP_RATEMASK=90 + NET_IPV4_ICMP_RATEMASK=90, + NET_TCP_TW_REUSE=91 }; enum { @@ -333,7 +334,8 @@ enum NET_IPV4_CONF_BOOTP_RELAY=10, NET_IPV4_CONF_LOG_MARTIANS=11, NET_IPV4_CONF_TAG=12, - NET_IPV4_CONF_ARPFILTER=13 + NET_IPV4_CONF_ARPFILTER=13, + NET_IPV4_CONF_MEDIUM_ID=14, }; /* /proc/sys/net/ipv6 */ |