diff options
| author |   Daniel Borkmann <dxchgb@gmail.com> | 2012-09-24 02:23:59 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-09-24 16:49:21 -0400 |
| commit | 9e49e88958feb41ec701fa34b44723dabadbc28c (patch) | |
| tree | ab17d7738505ade25a0a16bf442086cbf07d0f22 /include/linux/filter.h | |
| parent | net: mipsnet: Remove the MIPSsim Ethernet driver. (diff) | |
| download | linux-dev-9e49e88958feb41ec701fa34b44723dabadbc28c.tar.xz linux-dev-9e49e88958feb41ec701fa34b44723dabadbc28c.zip | |
filter: add XOR instruction for use with X/K
SKF_AD_ALU_XOR_X has been added a while ago, but as an 'ancillary'
operation that is invoked through a negative offset in K within BPF
load operations. Since BPF_MOD has recently been added, BPF_XOR should
also be part of the common ALU operations. Removing SKF_AD_ALU_XOR_X
might not be an option since this is exposed to user space.
Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/filter.h')
| -rw-r--r-- | include/linux/filter.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 3cf5fd561d86..2ded090e10f4 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -75,6 +75,7 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ #define BPF_RSH 0x70 #define BPF_NEG 0x80 #define BPF_MOD 0x90 +#define BPF_XOR 0xa0 #define BPF_JA 0x00 #define BPF_JEQ 0x10 @@ -204,6 +205,8 @@ enum { BPF_S_ALU_AND_X, BPF_S_ALU_OR_K, BPF_S_ALU_OR_X, + BPF_S_ALU_XOR_K, + BPF_S_ALU_XOR_X, BPF_S_ALU_LSH_K, BPF_S_ALU_LSH_X, BPF_S_ALU_RSH_K, |