mbox

[GIT,PULL,nf-next,00/21] Second Round of IPVS Updates for v3.18

Message ID 1410827675-3637-1-git-send-email-horms@verge.net.au
State Superseded
Delegated to: Pablo Neira
Headers show

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs2-for-v3.18

Message

Simon Horman Sept. 16, 2014, 12:34 a.m. UTC
Hi Pablo,

please consider these IPVS updates for v3.18.

* Add simple weighted failover scheduler
  - Thanks to Kenny Mathis
* Support v6 real servers in v4 pools and vice versa
  - Thanks to Alex Gartrell and Julian Anastasov


The following changes since commit 0bbe80e571c7b866afd92a98edd32a969467a7a9:

  netfilter: masquerading needs to be independent of x_tables in Kconfig (2014-09-12 09:40:18 +0200)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs2-for-v3.18

for you to fetch changes up to 87f2b83b77d6139a888af87352ff35894e5c5d69:

  ipvs: Allow heterogeneous pools now that we support them (2014-09-16 09:03:43 +0900)

----------------------------------------------------------------
Alex Gartrell (10):
      ipvs: Add destination address family to netlink interface
      ipvs: Supply destination addr family to ip_vs_{lookup_dest,find_dest}
      ipvs: Pass destination address family to ip_vs_trash_get_dest
      ipvs: Supply destination address family to ip_vs_conn_new
      ipvs: prevent mixing heterogeneous pools and synchronization
      ipvs: Pull out crosses_local_route_boundary logic
      ipvs: Pull out update_pmtu code
      ipvs: Add generic ensure_mtu_is_adequate to handle mixed pools
      ipvs: support ipv4 in ipv6 and ipv6 in ipv4 tunnel forwarding
      ipvs: Allow heterogeneous pools now that we support them

Julian Anastasov (10):
      ipvs: address family of LBLC entry depends on svc family
      ipvs: address family of LBLCR entry depends on svc family
      ipvs: use correct address family in DH logs
      ipvs: use correct address family in LC logs
      ipvs: use correct address family in NQ logs
      ipvs: use correct address family in RR logs
      ipvs: use correct address family in SED logs
      ipvs: use correct address family in SH logs
      ipvs: use correct address family in WLC logs
      ipvs: use the new dest addr family field

Kenny Mathis (1):
      ipvs: Add simple weighted failover scheduler

 include/net/ip_vs.h                   |  15 +-
 include/uapi/linux/ip_vs.h            |   3 +
 net/netfilter/ipvs/Kconfig            |  10 +
 net/netfilter/ipvs/Makefile           |   1 +
 net/netfilter/ipvs/ip_vs_conn.c       |  74 +++++--
 net/netfilter/ipvs/ip_vs_core.c       |  15 +-
 net/netfilter/ipvs/ip_vs_ctl.c        | 112 +++++++---
 net/netfilter/ipvs/ip_vs_dh.c         |   2 +-
 net/netfilter/ipvs/ip_vs_fo.c         |  79 +++++++
 net/netfilter/ipvs/ip_vs_ftp.c        |   6 +-
 net/netfilter/ipvs/ip_vs_lblc.c       |  12 +-
 net/netfilter/ipvs/ip_vs_lblcr.c      |  12 +-
 net/netfilter/ipvs/ip_vs_lc.c         |   2 +-
 net/netfilter/ipvs/ip_vs_nq.c         |   3 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c |   2 +-
 net/netfilter/ipvs/ip_vs_proto_tcp.c  |   2 +-
 net/netfilter/ipvs/ip_vs_rr.c         |   2 +-
 net/netfilter/ipvs/ip_vs_sed.c        |   3 +-
 net/netfilter/ipvs/ip_vs_sh.c         |   8 +-
 net/netfilter/ipvs/ip_vs_sync.c       |  13 +-
 net/netfilter/ipvs/ip_vs_wlc.c        |   3 +-
 net/netfilter/ipvs/ip_vs_xmit.c       | 388 +++++++++++++++++++++-------------
 22 files changed, 543 insertions(+), 224 deletions(-)
 create mode 100644 net/netfilter/ipvs/ip_vs_fo.c
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Pablo Neira Ayuso Sept. 16, 2014, 5:25 p.m. UTC | #1
Hi Simon,

On Tue, Sep 16, 2014 at 09:34:14AM +0900, Simon Horman wrote:
> Hi Pablo,
> 
> please consider these IPVS updates for v3.18.
> 
> * Add simple weighted failover scheduler
>   - Thanks to Kenny Mathis
> * Support v6 real servers in v4 pools and vice versa
>   - Thanks to Alex Gartrell and Julian Anastasov

I need a slightly larger description of this series.

I think you can merge patches 13-19 too. They are mostly two liners
with a similar description, so they naturally belong to the same
logical change. I would like to reduce the patchbomb pull request for
David.

Thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html