Merge branch 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index 10117c8..de8399a 100644 (file)
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -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;
        }