libata: kill probe_ent and related helpers

[pandora-kernel.git] / include / net / inet_ecn.h

diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index 7849844..de8399a 100644 (file)
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -53,7 +53,7 @@ static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
 
 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;
 }
@@ -95,13 +95,13 @@ 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)
@@ -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;
        }