diff options
| author | David S. Miller | 2013-04-11 22:14:37 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-04-11 22:14:37 +0200 |
| commit | 16e3d9648add0b3839587fd77f510537baf88c3a (patch) | |
| tree | 67831545a57cf08820b7f59d0e745e3b30d1a0ee /net/ipv6 | |
| parent | net/mlx4_en: set correct MTU in SRIOV (diff) | |
| parent | xfrm_user: constify netlink dispatch table (diff) | |
| download | kernel-qcow2-linux-16e3d9648add0b3839587fd77f510537baf88c3a.tar.gz kernel-qcow2-linux-16e3d9648add0b3839587fd77f510537baf88c3a.tar.xz kernel-qcow2-linux-16e3d9648add0b3839587fd77f510537baf88c3a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next
Steffen Klassert says:
====================
1) Allow to avoid copying DSCP during encapsulation
by setting a SA flag. From Nicolas Dichtel.
2) Constify the netlink dispatch table, no need to modify it
at runtime. From Mathias Krause.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/xfrm6_mode_tunnel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c index 9bf6a74a71d2..4770d515c2c8 100644 --- a/net/ipv6/xfrm6_mode_tunnel.c +++ b/net/ipv6/xfrm6_mode_tunnel.c @@ -49,8 +49,11 @@ static int xfrm6_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb) sizeof(top_iph->flow_lbl)); top_iph->nexthdr = xfrm_af2proto(skb_dst(skb)->ops->family); - dsfield = XFRM_MODE_SKB_CB(skb)->tos; - dsfield = INET_ECN_encapsulate(dsfield, dsfield); + if (x->props.extra_flags & XFRM_SA_XFLAG_DONT_ENCAP_DSCP) + dsfield = 0; + else + dsfield = XFRM_MODE_SKB_CB(skb)->tos; + dsfield = INET_ECN_encapsulate(dsfield, XFRM_MODE_SKB_CB(skb)->tos); if (x->props.flags & XFRM_STATE_NOECN) dsfield &= ~INET_ECN_MASK; ipv6_change_dsfield(top_iph, 0, dsfield); |