diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-05-03 10:23:43 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-05-03 10:23:43 +0300 |
| commit | 617e3ea3ed2ee26b22d372dc1ba39c71f9d1c8ed (patch) | |
| tree | 1b17c938b165abfe6e42a7d4aae935048dc5f01f /include/net/pkt_cls.h | |
| parent | 7a57011a5e7c4082fdfd204115a8212298ef723f (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge branch 'origin'kvm-22
Diffstat (limited to 'include/net/pkt_cls.h')
| -rw-r--r-- | include/net/pkt_cls.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index 02647fe3d74b..4129df708079 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h @@ -326,18 +326,18 @@ static inline unsigned char * tcf_get_base_ptr(struct sk_buff *skb, int layer) case TCF_LAYER_LINK: return skb->data; case TCF_LAYER_NETWORK: - return skb->nh.raw; + return skb_network_header(skb); case TCF_LAYER_TRANSPORT: - return skb->h.raw; + return skb_transport_header(skb); } 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); + return unlikely((ptr + len) < skb_tail_pointer(skb) && ptr > skb->head); } #ifdef CONFIG_NET_CLS_IND |