summaryrefslogtreecommitdiff
path: root/net/netfilter/nfnetlink.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-09-18 10:57:46 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2014-09-18 10:59:33 +0200
commitfcfa8f493f4b52b99c29067c4eed8887af9ed951 (patch)
treeac91e981e17f8a803671a0d4bb0440578ed9d33f /net/netfilter/nfnetlink.c
parent07034aeae152de52c29f032ca995bf9dafbe24e2 (diff)
parentbc18d37f676f76edbb5e0c37def78c704b5fbed0 (diff)
Merge branch 'ipvs-next'
Simon Horman says: ==================== This pull requests makes the following changes: * Add simple weighted fail-over scheduler. - Unlike other IPVS schedulers this offers fail-over rather than load balancing. Connections are directed to the appropriate server based solely on highest weight value and server availability. - Thanks to Kenny Mathis * Support IPv6 real servers in IPv4 virtual-services and vice versa - This feature is supported in conjunction with the tunnel (IPIP) forwarding mechanism. That is, IPv4 may be forwarded in IPv6 and vice versa. - The motivation for this is to allow more flexibility in the choice of IP version offered by both virtual-servers and real-servers as they no longer need to match: An IPv4 connection from an end-user may be forwarded to a real-server using IPv6 and vice versa. - Further work need to be done to support this feature in conjunction with connection synchronisation. For now such configurations are not allowed. - This change includes update to netlink protocol, adding a new destination address family attribute. And the necessary changes to plumb this information throughout IPVS. - Thanks to Alex Gartrell and Julian Anastasov ==================== Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nfnetlink.c')
0 files changed, 0 insertions, 0 deletions