From: Simon Horman <horms@verge.net.au>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: lvs-devel@vger.kernel.org, netdev@vger.kernel.org,
netfilter-devel@vger.kernel.org,
Wensong Zhang <wensong@linux-vs.org>,
Julian Anastasov <ja@ssi.bg>,
Daniel Borkmann <dborkman@redhat.com>,
Simon Horman <horms@verge.net.au>
Subject: [GIT PULL] Second Round of IPVS updates for v3.13
Date: Wed, 30 Oct 2013 10:11:24 +0900 [thread overview]
Message-ID: <1383095486-5215-1-git-send-email-horms@verge.net.au> (raw)
Hi Pablo,
please consider this second round of updates or IPVS for v3.13,
based on nf-next.
I realise this is rather late in the game as the v3.13 merge window
is just round the corner. So please let me know if you would
like me to handle things a different way.
There are two SCTP changes by Daniel Borkman.
* Correct verdict assignments in sctp_conn_schedule
This is a bug fix for incorrect handling of the error case
where skb_header_pointer() fails.
It appears that this problem has been present since SCTP was added
to IPVS in v2.6.34.
I would like this change considered for -stable all the way back
to v2.6.34. I have checked and it cherry-picks cleanly on top
of v3.12-rc7 and v3.11. And seems to apply with some trivial merge conflicts
on top of v3.4, v3.2 and v3.6.34. I am happy to supply versions of
the patch that resolve those conflicts.
* Do not recalculate SCTP checksum if ports don't change
This is an enhancement which should lead to increased performance
in some cases.
The following changes since commit 6b8dbcf2c44fd7aa716560d04e9857c870bd510c:
bridge: netfilter: orphan skb before invoking ip netfilter hooks (2013-10-27 21:44:33 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs2-for-v3.13
for you to fetch changes up to 97203abe6bc41ee020f37c902bd1a761157f22c1:
net: ipvs: sctp: do not recalc sctp csum when ports didn't change (2013-10-30 09:48:16 +0900)
----------------------------------------------------------------
Second Round of IPVS updates for v3.13
Some SCTP changes by Daniel Borkman.
* Correct verdict assignments in sctp_conn_schedule
This is a bug fix for incorrect handling of the error case
where skb_header_pointer() fails.
It appears that this problem has been present since SCTP was added
to IPVS in v2.6.34.
* Do not recalculate SCTP checksum if ports don't change
This is an enhancement which should lead to increased performance
in some cases.
----------------------------------------------------------------
Daniel Borkmann (2):
net: ipvs: sctp: add missing verdict assignments in sctp_conn_schedule
net: ipvs: sctp: do not recalc sctp csum when ports didn't change
net/netfilter/ipvs/ip_vs_proto_sctp.c | 48 +++++++++++++++++++++++++++++------
1 file changed, 40 insertions(+), 8 deletions(-)
next reply other threads:[~2013-10-30 1:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-30 1:11 Simon Horman [this message]
2013-10-30 1:11 ` [PATCH nf-next 1/2] net: ipvs: sctp: add missing verdict assignments in sctp_conn_schedule Simon Horman
2013-10-30 1:11 ` [PATCH nf-next 2/2] net: ipvs: sctp: do not recalc sctp csum when ports didn't change Simon Horman
2013-11-03 21:35 ` [GIT PULL] Second Round of IPVS updates for v3.13 Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383095486-5215-1-git-send-email-horms@verge.net.au \
--to=horms@verge.net.au \
--cc=dborkman@redhat.com \
--cc=ja@ssi.bg \
--cc=lvs-devel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
--cc=wensong@linux-vs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).