diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-07 23:49:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-07 23:49:20 -0800 |
| commit | 5f3ac18254b2a6d1186c88e72bdede4bea6423bd (patch) | |
| tree | 8340b61969eb9b8c5d43841cce1386a54222f6f6 /include/linux | |
| parent | 05beebbe155da04c2d356cb7957488ca6f17ed54 (diff) | |
| parent | dd12d6d526e721b2c072a5a55e30860012f3d66c (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sysctl.h | 3 |
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 { |