3 files changed, 4 insertions, 4 deletions

diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index b9ed3898e368..6fd4452c15d9 100644
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -116,7 +116,7 @@ static inline int INET_ECN_set_ce(struct sk_buff *skb)
         case __constant_htons(ETH_P_IP):
                 if (skb_network_header(skb) + sizeof(struct iphdr) <=
                     skb->tail)
-                        return IP_ECN_set_ce(skb->nh.iph);
+                        return IP_ECN_set_ce(ip_hdr(skb));
                 break;
 
         case __constant_htons(ETH_P_IPV6):
diff --git a/include/net/ip.h b/include/net/ip.h
index 6f7ba32b199d..75f226d26e0d 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -46,7 +46,7 @@ struct inet_skb_parm
 
 static inline unsigned int ip_hdrlen(const struct sk_buff *skb)
 {
-        return skb->nh.iph->ihl * 4;
+        return ip_hdr(skb)->ihl * 4;
 }
 
 struct ipcm_cookie
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 8a6b0e7bded5..880eb7b54164 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -334,8 +334,8 @@ static inline unsigned char * tcf_get_base_ptr(struct sk_buff *skb, int layer)
         return NULL;
 }
 
-static inline int tcf_valid_offset(struct sk_buff *skb, unsigned char *ptr,
-                                   int len)
+static inline int tcf_valid_offset(const struct sk_buff *skb,
+                                   const unsigned char *ptr, const int len)
 {
         return unlikely((ptr + len) < skb->tail && ptr > skb->head);
 }