From 9a6b4e26535a61c8907b33bfcce64318870d555d Mon Sep 17 00:00:00 2001 From: Jan Seiffert Date: Fri, 30 Mar 2012 05:08:19 +0000 Subject: [PATCH] --- yaml --- r: 298743 b: refs/heads/master c: f03fb3f455c6c3a3dfcef6c7f2dcab104c813f4b h: refs/heads/master i: 298741: 7b8b6a0b889476bbed23050d48f98e2a16dce3b4 298739: 179bdf1fcf2995b51d77b2ce845115d96638eb97 298735: 8a05ffd9acb73487b0725849ea749f4592f1fe6d v: v3 --- [refs] | 2 +- trunk/net/core/filter.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 655cc5bdb34d..ab5755be6f69 100644 --- 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 index cf4989ac503b..6f755cca4520 100644 --- a/trunk/net/core/filter.c +++ b/trunk/net/core/filter.c @@ -39,8 +39,11 @@ #include #include -/* 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); } /**