Bluetooth: Fix race condition with L2CAP information request

[safe/jmp/linux-2.6] / include / net / inet_ecn.h

diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index 06a2c69..9b5d08f 100644 (file)
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -47,7 +47,7 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
     } while (0)
 
 #define        IP6_ECN_flow_xmit(sk, label) do {                               \
-       if (INET_ECN_is_capable(inet_sk(sk)->tos))                      \
+       if (INET_ECN_is_capable(inet6_sk(sk)->tclass))                  \
                (label) |= htonl(INET_ECN_ECT_0 << 20);                 \
     } while (0)
 
@@ -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,24 +104,22 @@ 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);
 }
 
 static inline int INET_ECN_set_ce(struct sk_buff *skb)
 {
        switch (skb->protocol) {
-       case __constant_htons(ETH_P_IP):
-               if (skb_network_header(skb) + sizeof(struct iphdr) <=
-                   skb->tail)
+       case cpu_to_be16(ETH_P_IP):
+               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_network_header(skb) + sizeof(struct ipv6hdr) <=
-                   skb->tail)
+       case cpu_to_be16(ETH_P_IPV6):
+               if (skb->network_header + sizeof(struct ipv6hdr) <= skb->tail)
                        return IP6_ECN_set_ce(ipv6_hdr(skb));
                break;
        }