netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL next-2.6] IPVS
@ 2011-06-13  8:26 Simon Horman
  2011-06-13  8:26 ` [PATCH 1/3] ipvs: support more FTP PASV responses Simon Horman
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Simon Horman @ 2011-06-13  8:26 UTC (permalink / raw)
  To: lvs-devel, netdev, netfilter-devel, netfilter
  Cc: Wensong Zhang, Julian Anastasov, Patrick McHardy,
	Pablo Neira Ayuso

Hi Patrick, Hi Pablo,

please consider pulling
git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next-2.6.git master

It includes two clean-ups by Hans
and an enhancement of the FTP helper by Julian.

I have based the pull request on next-2.6 as
nf-next-2.6 seems to be a little old. Please let me
know if a different base would suit you better.

Hans Schillstrom (2):
      IPVS remove unused var from migration to netns
      IPVS: rename of netns init and cleanup functions.

Julian Anastasov (1):
      ipvs: support more FTP PASV responses

 include/net/ip_vs.h              |   28 +++++++++-----------
 net/netfilter/ipvs/ip_vs_app.c   |    4 +-
 net/netfilter/ipvs/ip_vs_conn.c  |    4 +-
 net/netfilter/ipvs/ip_vs_core.c  |   36 +++++++++++++-------------
 net/netfilter/ipvs/ip_vs_ctl.c   |   20 +++++++-------
 net/netfilter/ipvs/ip_vs_est.c   |    4 +-
 net/netfilter/ipvs/ip_vs_ftp.c   |   52 +++++++++++++++++++++++++++----------
 net/netfilter/ipvs/ip_vs_proto.c |    4 +-
 net/netfilter/ipvs/ip_vs_sync.c  |    4 +-
 9 files changed, 89 insertions(+), 67 deletions(-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-06-14 23:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-13  8:26 [GIT PULL next-2.6] IPVS Simon Horman
2011-06-13  8:26 ` [PATCH 1/3] ipvs: support more FTP PASV responses Simon Horman
2011-06-13  8:26 ` [PATCH 2/3] IPVS remove unused var from migration to netns Simon Horman
2011-06-13  8:26 ` [PATCH 3/3] IPVS: rename of netns init and cleanup functions Simon Horman
2011-06-14 23:42 ` [GIT PULL next-2.6] IPVS Simon Horman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).