---

yaml --- r: 223642 b: refs/heads/master c: da521b2 h: refs/heads/master v: v3
git-mirror · Dec 21, 2010 · 324999c · 324999c
1 parent 03edb97
commit 324999c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa3e219997e4b949be4199660936099ded0b401f
+refs/heads/master: da521b2c4f046383bc8941604174bc0e8bffb430
diff --git a/trunk/include/net/pkt_cls.h b/trunk/include/net/pkt_cls.h
@@ -323,7 +323,9 @@ static inline unsigned char * tcf_get_base_ptr(struct sk_buff *skb, int layer)
 static inline int tcf_valid_offset(const struct sk_buff *skb,
 				   const unsigned char *ptr, const int len)
 {
-	return unlikely((ptr + len) < skb_tail_pointer(skb) && ptr > skb->head);
+	return likely((ptr + len) <= skb_tail_pointer(skb) &&
+		      ptr >= skb->head &&
+		      (ptr <= (ptr + len)));
 }
 
 #ifdef CONFIG_NET_CLS_IND