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/inetdevice.h | |
parent | 8973a585aec125beb2a3de50bb491004299f53d5 (diff) | |
parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
download | op-kernel-dev-edb3e182b6f33c91ba8778e2198220c12712d3ad.zip op-kernel-dev-edb3e182b6f33c91ba8778e2198220c12712d3ad.tar.gz |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'include/linux/inetdevice.h')
-rw-r--r-- | include/linux/inetdevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index 6fafb27..7e1e15f 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -29,6 +29,7 @@ struct ipv4_devconf int no_xfrm; int no_policy; int force_igmp_version; + int promote_secondaries; void *sysctl; }; @@ -71,6 +72,7 @@ struct in_device #define IN_DEV_SEC_REDIRECTS(in_dev) (ipv4_devconf.secure_redirects || (in_dev)->cnf.secure_redirects) #define IN_DEV_IDTAG(in_dev) ((in_dev)->cnf.tag) #define IN_DEV_MEDIUM_ID(in_dev) ((in_dev)->cnf.medium_id) +#define IN_DEV_PROMOTE_SECONDARIES(in_dev) (ipv4_devconf.promote_secondaries || (in_dev)->cnf.promote_secondaries) #define IN_DEV_RX_REDIRECTS(in_dev) \ ((IN_DEV_FORWARD(in_dev) && \ |