diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-31 17:32:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-31 17:32:44 -0400 |
| commit | af6f5e3247a68074e384ef93c0b4bce1b73c9d80 (patch) | |
| tree | 87b0f1e48bd0ca67a78fab0fa42b37864863fdfd /include/linux/sysctl.h | |
| parent | 7e2987503dda95a5f80290bb8c06279009c2419e (diff) | |
| parent | 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/sysctl.h')
| -rw-r--r-- | include/linux/sysctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 772998147e3e..23032d9d6071 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -399,6 +399,7 @@ enum | |||
| 399 | NET_IPV4_CONF_FORCE_IGMP_VERSION=17, | 399 | NET_IPV4_CONF_FORCE_IGMP_VERSION=17, |
| 400 | NET_IPV4_CONF_ARP_ANNOUNCE=18, | 400 | NET_IPV4_CONF_ARP_ANNOUNCE=18, |
| 401 | NET_IPV4_CONF_ARP_IGNORE=19, | 401 | NET_IPV4_CONF_ARP_IGNORE=19, |
| 402 | NET_IPV4_CONF_PROMOTE_SECONDARIES=20, | ||
| 402 | __NET_IPV4_CONF_MAX | 403 | __NET_IPV4_CONF_MAX |
| 403 | }; | 404 | }; |
| 404 | 405 | ||