aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2007-11-14 00:40:13 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:53:45 -0500
commit29bb43b4ec4e625b0659186fc8a7c8f8b7c81982 (patch)
tree8c04e70edb9ef5d0a76793add6b70cf530f41913 /net/ipv4
parenta2deb6d26f16ed7bf787dbd6a58c5d7be47d8db3 (diff)
[INET]: Give outer DSCP directly to ip*_copy_dscp
This patch changes the prototype of ipv4_copy_dscp and ipv6_copy_dscp so that they directly take the outer DSCP rather than the outer IP header. This will help us to unify the code for inter-family tunnels. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/xfrm4_mode_tunnel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index e4deecba6dd2..68a9f56ff09f 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -113,7 +113,7 @@ static int xfrm4_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
113 iph = ip_hdr(skb); 113 iph = ip_hdr(skb);
114 if (iph->protocol == IPPROTO_IPIP) { 114 if (iph->protocol == IPPROTO_IPIP) {
115 if (x->props.flags & XFRM_STATE_DECAP_DSCP) 115 if (x->props.flags & XFRM_STATE_DECAP_DSCP)
116 ipv4_copy_dscp(iph, ipip_hdr(skb)); 116 ipv4_copy_dscp(ipv4_get_dsfield(iph), ipip_hdr(skb));
117 if (!(x->props.flags & XFRM_STATE_NOECN)) 117 if (!(x->props.flags & XFRM_STATE_NOECN))
118 ipip_ecn_decapsulate(skb); 118 ipip_ecn_decapsulate(skb);
119 } 119 }