---

yaml --- r: 298743 b: refs/heads/master c: f03fb3f h: refs/heads/master i: 298741: 7b8b6a0 298739: 179bdf1 298735: 8a05ffd v: v3
git-mirror · Apr 3, 2012 · 9a6b4e2 · 9a6b4e2
1 parent 70e452c
commit 9a6b4e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d6bd8619db5a30668093c1b2967674645cf0736
+refs/heads/master: f03fb3f455c6c3a3dfcef6c7f2dcab104c813f4b
diff --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c
@@ -39,8 +39,11 @@
 #include <linux/reciprocal_div.h>
 #include <linux/ratelimit.h>
 
-/* No hurry in this branch */
-static void *__load_pointer(const struct sk_buff *skb, int k, unsigned int size)
+/* No hurry in this branch
+ *
+ * Exported for the bpf jit load helper.
+ */
+void *bpf_internal_load_pointer_neg_helper(const struct sk_buff *skb, int k, unsigned int size)
 {
 	u8 *ptr = NULL;
 
@@ -59,7 +62,7 @@ static inline void *load_pointer(const struct sk_buff *skb, int k,
 {
 	if (k >= 0)
 		return skb_header_pointer(skb, k, size, buffer);
-	return __load_pointer(skb, k, size);
+	return bpf_internal_load_pointer_neg_helper(skb, k, size);
 }
 
 /**