diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-03 01:03:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-04-03 01:03:45 -0800 |
| commit | 5e4b50795ee8c7659a1181cea4c98712e02ea63e (patch) | |
| tree | b4e0f1a19c549bc54e93f4ada5c3b0a0953e58cb /include/linux/sysctl.h | |
| parent | 893d709002e952c54cce2e140854207a5f7fdcca (diff) | |
| parent | 6a1a68c8febfc71c895a05a10afe6812b7c77584 (diff) | |
Merge bk://linuxusb.bkbits.net/linus-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
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 */ |