summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2004-03-07 20:32:25 -0800
committerDavid S. Miller <davem@nuts.davemloft.net>2004-03-07 20:32:25 -0800
commitdd12d6d526e721b2c072a5a55e30860012f3d66c (patch)
treedda2cdc5cdf32682cb91354bb6fbf29ea321da32 /include/linux
parent52d820cbbe839f0dcf111c17d4017fcb1f65bb93 (diff)
parentb46f30e25f93439eaf6d20882a7b9d19d754e413 (diff)
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sysctl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index fca4306e8f58..dbd57168ac61 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -405,7 +405,8 @@ enum {
NET_IPV6_IP6FRAG_HIGH_THRESH=21,
NET_IPV6_IP6FRAG_LOW_THRESH=22,
NET_IPV6_IP6FRAG_TIME=23,
- NET_IPV6_IP6FRAG_SECRET_INTERVAL=24
+ NET_IPV6_IP6FRAG_SECRET_INTERVAL=24,
+ NET_IPV6_MLD_MAX_MSF=25,
};
enum {