diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-11-13 21:40:13 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:53:45 -0800 |
| commit | 29bb43b4ec4e625b0659186fc8a7c8f8b7c81982 (patch) | |
| tree | 8c04e70edb9ef5d0a76793add6b70cf530f41913 /net/ipv6/ip6_tunnel.c | |
| parent | a2deb6d26f16ed7bf787dbd6a58c5d7be47d8db3 (diff) | |
| download | lwn-29bb43b4ec4e625b0659186fc8a7c8f8b7c81982.tar.gz lwn-29bb43b4ec4e625b0659186fc8a7c8f8b7c81982.zip | |
[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/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 5383b33db8ca..a4051afaf776 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -635,7 +635,7 @@ static void ip6ip6_dscp_ecn_decapsulate(struct ip6_tnl *t, struct sk_buff *skb) { if (t->parms.flags & IP6_TNL_F_RCV_DSCP_COPY) - ipv6_copy_dscp(ipv6h, ipv6_hdr(skb)); + ipv6_copy_dscp(ipv6_get_dsfield(ipv6h), ipv6_hdr(skb)); if (INET_ECN_is_ce(ipv6_get_dsfield(ipv6h))) IP6_ECN_set_ce(ipv6_hdr(skb)); |