mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
[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>
This commit is contained in:
parent
a2deb6d26f
commit
29bb43b4ec
4 changed files with 8 additions and 7 deletions
|
|
@ -83,9 +83,9 @@ static inline void IP_ECN_clear(struct iphdr *iph)
|
|||
iph->tos &= ~INET_ECN_MASK;
|
||||
}
|
||||
|
||||
static inline void ipv4_copy_dscp(struct iphdr *outer, struct iphdr *inner)
|
||||
static inline void ipv4_copy_dscp(unsigned int dscp, struct iphdr *inner)
|
||||
{
|
||||
u32 dscp = ipv4_get_dsfield(outer) & ~INET_ECN_MASK;
|
||||
dscp &= ~INET_ECN_MASK;
|
||||
ipv4_change_dsfield(inner, INET_ECN_MASK, dscp);
|
||||
}
|
||||
|
||||
|
|
@ -104,9 +104,9 @@ static inline void IP6_ECN_clear(struct ipv6hdr *iph)
|
|||
*(__be32*)iph &= ~htonl(INET_ECN_MASK << 20);
|
||||
}
|
||||
|
||||
static inline void ipv6_copy_dscp(struct ipv6hdr *outer, struct ipv6hdr *inner)
|
||||
static inline void ipv6_copy_dscp(unsigned int dscp, struct ipv6hdr *inner)
|
||||
{
|
||||
u32 dscp = ipv6_get_dsfield(outer) & ~INET_ECN_MASK;
|
||||
dscp &= ~INET_ECN_MASK;
|
||||
ipv6_change_dsfield(inner, INET_ECN_MASK, dscp);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue