Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c3710af authored by Changli Gao's avatar Changli Gao Committed by David S. Miller
Browse files

net: move definitions of BPF_S_* to net/core/filter.c 



BPF_S_* are used internally, should not be exposed to the others.

Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarHagen Paul Pfeifer <hagen@jauu.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cba328fc

include/linux/filter.h

+0 −48
Original line number Diff line number Diff line
@@ -91,54 +91,6 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ 
#define         BPF_TAX         0x00

#define         BPF_TXA         0x80



enum {

	BPF_S_RET_K = 0,

	BPF_S_RET_A,

	BPF_S_ALU_ADD_K,

	BPF_S_ALU_ADD_X,

	BPF_S_ALU_SUB_K,

	BPF_S_ALU_SUB_X,

	BPF_S_ALU_MUL_K,

	BPF_S_ALU_MUL_X,

	BPF_S_ALU_DIV_X,

	BPF_S_ALU_AND_K,

	BPF_S_ALU_AND_X,

	BPF_S_ALU_OR_K,

	BPF_S_ALU_OR_X,

	BPF_S_ALU_LSH_K,

	BPF_S_ALU_LSH_X,

	BPF_S_ALU_RSH_K,

	BPF_S_ALU_RSH_X,

	BPF_S_ALU_NEG,

	BPF_S_LD_W_ABS,

	BPF_S_LD_H_ABS,

	BPF_S_LD_B_ABS,

	BPF_S_LD_W_LEN,

	BPF_S_LD_W_IND,

	BPF_S_LD_H_IND,

	BPF_S_LD_B_IND,

	BPF_S_LD_IMM,

	BPF_S_LDX_W_LEN,

	BPF_S_LDX_B_MSH,

	BPF_S_LDX_IMM,

	BPF_S_MISC_TAX,

	BPF_S_MISC_TXA,

	BPF_S_ALU_DIV_K,

	BPF_S_LD_MEM,

	BPF_S_LDX_MEM,

	BPF_S_ST,

	BPF_S_STX,

	BPF_S_JMP_JA,

	BPF_S_JMP_JEQ_K,

	BPF_S_JMP_JEQ_X,

	BPF_S_JMP_JGE_K,

	BPF_S_JMP_JGE_X,

	BPF_S_JMP_JGT_K,

	BPF_S_JMP_JGT_X,

	BPF_S_JMP_JSET_K,

	BPF_S_JMP_JSET_X,

};



#ifndef BPF_MAXINSNS

#define BPF_MAXINSNS 4096

#endif

net/core/filter.c

+48 −0
Original line number Diff line number Diff line
@@ -38,6 +38,54 @@ 
#include <asm/unaligned.h>

#include <linux/filter.h>



enum {

	BPF_S_RET_K = 0,

	BPF_S_RET_A,

	BPF_S_ALU_ADD_K,

	BPF_S_ALU_ADD_X,

	BPF_S_ALU_SUB_K,

	BPF_S_ALU_SUB_X,

	BPF_S_ALU_MUL_K,

	BPF_S_ALU_MUL_X,

	BPF_S_ALU_DIV_X,

	BPF_S_ALU_AND_K,

	BPF_S_ALU_AND_X,

	BPF_S_ALU_OR_K,

	BPF_S_ALU_OR_X,

	BPF_S_ALU_LSH_K,

	BPF_S_ALU_LSH_X,

	BPF_S_ALU_RSH_K,

	BPF_S_ALU_RSH_X,

	BPF_S_ALU_NEG,

	BPF_S_LD_W_ABS,

	BPF_S_LD_H_ABS,

	BPF_S_LD_B_ABS,

	BPF_S_LD_W_LEN,

	BPF_S_LD_W_IND,

	BPF_S_LD_H_IND,

	BPF_S_LD_B_IND,

	BPF_S_LD_IMM,

	BPF_S_LDX_W_LEN,

	BPF_S_LDX_B_MSH,

	BPF_S_LDX_IMM,

	BPF_S_MISC_TAX,

	BPF_S_MISC_TXA,

	BPF_S_ALU_DIV_K,

	BPF_S_LD_MEM,

	BPF_S_LDX_MEM,

	BPF_S_ST,

	BPF_S_STX,

	BPF_S_JMP_JA,

	BPF_S_JMP_JEQ_K,

	BPF_S_JMP_JEQ_X,

	BPF_S_JMP_JGE_K,

	BPF_S_JMP_JGE_X,

	BPF_S_JMP_JGT_K,

	BPF_S_JMP_JGT_X,

	BPF_S_JMP_JSET_K,

	BPF_S_JMP_JSET_X,

};



/* No hurry in this branch */

static void *__load_pointer(struct sk_buff *skb, int k)

{