diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2004-02-04 19:28:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-02-04 19:28:12 -0800 |
| commit | 4018758dc9e29983d83f0bd4ffa2a0cb3f182396 (patch) | |
| tree | f07fb6439f9e47ec82af73c66e35527fd40e763e /include/linux/sysctl.h | |
| parent | fe7d979accc61adff8aaa4d3dc113f9a29ea8801 (diff) | |
| parent | fc850609be4fbacee77b6765aee9e796ded830c2 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
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 0d5b121f54a0..935be9d21b69 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -311,6 +311,7 @@ enum NET_TCP_FRTO=92, NET_TCP_LOW_LATENCY=93, NET_IPV4_IPFRAG_SECRET_INTERVAL=94, + NET_TCP_WESTWOOD=95, }; enum { @@ -360,6 +361,7 @@ enum NET_IPV4_CONF_MEDIUM_ID=14, NET_IPV4_CONF_NOXFRM=15, NET_IPV4_CONF_NOPOLICY=16, + NET_IPV4_CONF_FORCE_IGMP_VERSION=17, }; /* /proc/sys/net/ipv4/netfilter */ |