[INET]: Give outer DSCP directly to ip*_copy_dscp

[linux-2.6-omap-h63xx.git] / include / net / inet_ecn.h

diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index d599c6bfbb86bc5eb0e83f91f9f7fb417d4631f2..ba33db0538545a55c39553042278f52d318611e8 100644 (file)
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -48,12 +48,12 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
 
 #define        IP6_ECN_flow_xmit(sk, label) do {                               \
        if (INET_ECN_is_capable(inet_sk(sk)->tos))                      \
-               (label) |= __constant_htons(INET_ECN_ECT_0 << 4);       \
+               (label) |= htonl(INET_ECN_ECT_0 << 20);                 \
     } while (0)
 
 static inline int IP_ECN_set_ce(struct iphdr *iph)
 {
-       u32 check = iph->check;
+       u32 check = (__force u32)iph->check;
        u32 ecn = (iph->tos + 1) & INET_ECN_MASK;
 
        /*
@@ -71,9 +71,9 @@ static inline int IP_ECN_set_ce(struct iphdr *iph)
         * INET_ECN_ECT_1 => check += htons(0xFFFD)
         * INET_ECN_ECT_0 => check += htons(0xFFFE)
         */
-       check += htons(0xFFFB) + htons(ecn);
+       check += (__force u16)htons(0xFFFB) + (__force u16)htons(ecn);
 
-       iph->check = check + (check>=0xFFFF);
+       iph->check = (__force __sum16)(check + (check>=0xFFFF));
        iph->tos |= INET_ECN_CE;
        return 1;
 }
@@ -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);
 }
 
@@ -95,18 +95,18 @@ static inline int IP6_ECN_set_ce(struct ipv6hdr *iph)
 {
        if (INET_ECN_is_not_ect(ipv6_get_dsfield(iph)))
                return 0;
-       *(u32*)iph |= htonl(INET_ECN_CE << 20);
+       *(__be32*)iph |= htonl(INET_ECN_CE << 20);
        return 1;
 }
 
 static inline void IP6_ECN_clear(struct ipv6hdr *iph)
 {
-       *(u32*)iph &= ~htonl(INET_ECN_MASK << 20);
+       *(__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);
 }
 
@@ -114,13 +114,13 @@ static inline int INET_ECN_set_ce(struct sk_buff *skb)
 {
        switch (skb->protocol) {
        case __constant_htons(ETH_P_IP):
-               if (skb->nh.raw + sizeof(struct iphdr) <= skb->tail)
-                       return IP_ECN_set_ce(skb->nh.iph);
+               if (skb->network_header + sizeof(struct iphdr) <= skb->tail)
+                       return IP_ECN_set_ce(ip_hdr(skb));
                break;
 
        case __constant_htons(ETH_P_IPV6):
-               if (skb->nh.raw + sizeof(struct ipv6hdr) <= skb->tail)
-                       return IP6_ECN_set_ce(skb->nh.ipv6h);
+               if (skb->network_header + sizeof(struct ipv6hdr) <= skb->tail)
+                       return IP6_ECN_set_ce(ipv6_hdr(skb));
                break;
        }