[SK_BUFF]: Introduce ip_hdr(), remove skb->nh.iph
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
e023dd6437
commit
eddc9ec53b
@@ -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):
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user