[GIT PULL] Third Round of IPVS Fixes for v3.16

[GIT PULL] Third Round of IPVS Fixes for v3.16

[Simon Horman]

Hi Pablo,

please consider this third round of IPVS fixes for v3.16.

It includes one change from Alex Gartrell to:

* Maintain all DSCP and ECN bits for IPv6 tun forwarding
  This resolves an inconsistency between IPv4 and IPv6 behaviour.
  This behaviour was added when IPv6 support was added to IPVS
  in v2.6.27.

This pull request is for an unsigned, unannotated tag.
Please let me know if this doesn't work with your work flow.

The following changes since commit 2627b7e15c5064ddd5e578e4efd948d48d531a3f:

  ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack (2014-07-16 09:39:28 +0900)

are available in the git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git tags/ipvs-fixes3-for-v3.16

for you to fetch changes up to 76f084bc10004b3050b2cff9cfac29148f1f6088:

  ipvs: Maintain all DSCP and ECN bits for ipv6 tun forwarding (2014-07-17 12:53:54 +0900)

----------------------------------------------------------------
Alex Gartrell (1):
      ipvs: Maintain all DSCP and ECN bits for ipv6 tun forwarding

 net/netfilter/ipvs/ip_vs_xmit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] ipvs: Maintain all DSCP and ECN bits for ipv6 tun forwarding

[Simon Horman]

From: Alex Gartrell <agartrell@fb.com>

Previously, only the four high bits of the tclass were maintained in the
ipv6 case.  This matches the behavior of ipv4, though whether or not we
should reflect ECN bits may be up for debate.

Signed-off-by: Alex Gartrell <agartrell@fb.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
 net/netfilter/ipvs/ip_vs_xmit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
index 73ba1cc..6f70bdd 100644
--- a/net/netfilter/ipvs/ip_vs_xmit.c
+++ b/net/netfilter/ipvs/ip_vs_xmit.c
@@ -967,8 +967,8 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
 	iph->nexthdr		=	IPPROTO_IPV6;
 	iph->payload_len	=	old_iph->payload_len;
 	be16_add_cpu(&iph->payload_len, sizeof(*old_iph));
-	iph->priority		=	old_iph->priority;
 	memset(&iph->flow_lbl, 0, sizeof(iph->flow_lbl));
+	ipv6_change_dsfield(iph, 0, ipv6_get_dsfield(old_iph));
 	iph->daddr = cp->daddr.in6;
 	iph->saddr = saddr;
 	iph->hop_limit		=	old_iph->hop_limit;
-- 
2.0.1

Re: [GIT PULL] Third Round of IPVS Fixes for v3.16

[Pablo Neira Ayuso]

On Tue, Jul 22, 2014 at 04:25:51PM +0900, Simon Horman wrote:
> Hi Pablo,
> 
> please consider this third round of IPVS fixes for v3.16.
> 
> It includes one change from Alex Gartrell to:
> 
> * Maintain all DSCP and ECN bits for IPv6 tun forwarding
>   This resolves an inconsistency between IPv4 and IPv6 behaviour.
>   This behaviour was added when IPv6 support was added to IPVS
>   in v2.6.27.
> 
> This pull request is for an unsigned, unannotated tag.
> Please let me know if this doesn't work with your work flow.
> 
> The following changes since commit 2627b7e15c5064ddd5e578e4efd948d48d531a3f:
> 
>   ipvs: avoid netns exit crash on ip_vs_conn_drop_conntrack (2014-07-16 09:39:28 +0900)
> 
> are available in the git repository at:
> 
>   https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git tags/ipvs-fixes3-for-v3.16

Pulled, thanks Simon.