diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-26 20:33:58 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-26 20:34:46 +0200 |
| commit | 1b383bf912b25029fb180cf2cf8f33f90d6cf97f (patch) | |
| tree | e5936f5275d180dfca9c810005f99a2b3b0c098f /include/uapi/linux | |
| parent | 1afe839e6b31a85fc53adbf8757d6373908d414d (diff) | |
| parent | d33288172e72c4729e8b9f2243fb40601afabc8f (diff) | |
| download | linux-stable-1b383bf912b25029fb180cf2cf8f33f90d6cf97f.tar.gz linux-stable-1b383bf912b25029fb180cf2cf8f33f90d6cf97f.tar.bz2 linux-stable-1b383bf912b25029fb180cf2cf8f33f90d6cf97f.zip | |
Merge tag 'ipvs2-for-v4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next
Simon Horman says:
====================
Second Round of IPVS Updates for v4.3
I realise these are a little late in the cycle, so if you would prefer
me to repost them for v4.4 then just let me know.
The updates include:
* A new scheduler from Raducu Deaconu
* Enhanced configurability of the sync daemon from Julian Anastasov
====================
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/ip_vs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/ip_vs.h b/include/uapi/linux/ip_vs.h index 3199243f2028..391395c06c7e 100644 --- a/include/uapi/linux/ip_vs.h +++ b/include/uapi/linux/ip_vs.h @@ -406,6 +406,11 @@ enum { IPVS_DAEMON_ATTR_STATE, /* sync daemon state (master/backup) */ IPVS_DAEMON_ATTR_MCAST_IFN, /* multicast interface name */ IPVS_DAEMON_ATTR_SYNC_ID, /* SyncID we belong to */ + IPVS_DAEMON_ATTR_SYNC_MAXLEN, /* UDP Payload Size */ + IPVS_DAEMON_ATTR_MCAST_GROUP, /* IPv4 Multicast Address */ + IPVS_DAEMON_ATTR_MCAST_GROUP6, /* IPv6 Multicast Address */ + IPVS_DAEMON_ATTR_MCAST_PORT, /* Multicast Port (base) */ + IPVS_DAEMON_ATTR_MCAST_TTL, /* Multicast TTL */ __IPVS_DAEMON_ATTR_MAX, }; |