summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJan Seiffert <kaffeemonster@googlemail.com>2012-03-30 05:08:19 +0000
committerDavid S. Miller <davem@davemloft.net>2012-04-03 18:01:03 -0400
commitf03fb3f455c6c3a3dfcef6c7f2dcab104c813f4b (patch)
tree5b658f40d38b0ac9c5f4f3e6c6292266df6a1d3c /net
parent5d6bd8619db5a30668093c1b2967674645cf0736 (diff)
downloadlinux-stable-f03fb3f455c6c3a3dfcef6c7f2dcab104c813f4b.tar.gz
linux-stable-f03fb3f455c6c3a3dfcef6c7f2dcab104c813f4b.tar.bz2
linux-stable-f03fb3f455c6c3a3dfcef6c7f2dcab104c813f4b.zip
bpf jit: Make the filter.c::__load_pointer helper non-static for the jits
The function is renamed to make it a little more clear what it does. It is not added to any .h because it is not for general consumption, only for bpf internal use (and so by the jits). Signed-of-by: Jan Seiffert <kaffeemonster@googlemail.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/filter.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/net/core/filter.c b/net/core/filter.c
index cf4989ac503b..6f755cca4520 100644
--- a/net/core/filter.c
+++ b/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);
}
/**