diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-31 11:50:32 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-31 11:50:32 -0400 |
| commit | edb3e182b6f33c91ba8778e2198220c12712d3ad (patch) | |
| tree | 6b741e144c2c83e901a325e5373dc0b8baf88534 /include/linux/sysctl.h | |
| parent | 8973a585aec125beb2a3de50bb491004299f53d5 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
| download | kernel-crypto-edb3e182b6f33c91ba8778e2198220c12712d3ad.tar.gz kernel-crypto-edb3e182b6f33c91ba8778e2198220c12712d3ad.tar.xz kernel-crypto-edb3e182b6f33c91ba8778e2198220c12712d3ad.zip | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
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 772998147e3..23032d9d607 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -399,6 +399,7 @@ enum NET_IPV4_CONF_FORCE_IGMP_VERSION=17, NET_IPV4_CONF_ARP_ANNOUNCE=18, NET_IPV4_CONF_ARP_IGNORE=19, + NET_IPV4_CONF_PROMOTE_SECONDARIES=20, __NET_IPV4_CONF_MAX }; |