Merge tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / tools / net / bpf_exp.y

diff --git a/tools/net/bpf_exp.y b/tools/net/bpf_exp.y
index e6306c51c26f9e7cb53342ad088a9db1e4e32423..e24eea1b0db539d8592247699b4f6697221cbb9d 100644 (file)
--- a/tools/net/bpf_exp.y
+++ b/tools/net/bpf_exp.y
@@ -56,7 +56,7 @@ static void bpf_set_jmp_label(char *label, enum jmp_type type);
 %token OP_LDXI
 
 %token K_PKT_LEN K_PROTO K_TYPE K_NLATTR K_NLATTR_NEST K_MARK K_QUEUE K_HATYPE
-%token K_RXHASH K_CPU K_IFIDX K_VLANT K_VLANP K_POFF K_RAND
+%token K_RXHASH K_CPU K_IFIDX K_VLAN_TCI K_VLAN_AVAIL K_VLAN_TPID K_POFF K_RAND
 
 %token ':' ',' '[' ']' '(' ')' 'x' 'a' '+' 'M' '*' '&' '#' '%'
 
@@ -155,10 +155,10 @@ ldb
        | OP_LDB K_CPU {
                bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_CPU); }
-       | OP_LDB K_VLANT {
+       | OP_LDB K_VLAN_TCI {
                bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_VLAN_TAG); }
-       | OP_LDB K_VLANP {
+       | OP_LDB K_VLAN_AVAIL {
                bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); }
        | OP_LDB K_POFF {
@@ -167,6 +167,9 @@ ldb
        | OP_LDB K_RAND {
                bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_RANDOM); }
+       | OP_LDB K_VLAN_TPID {
+               bpf_set_curr_instr(BPF_LD | BPF_B | BPF_ABS, 0, 0,
+                                  SKF_AD_OFF + SKF_AD_VLAN_TPID); }
        ;
 
 ldh
@@ -206,10 +209,10 @@ ldh
        | OP_LDH K_CPU {
                bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_CPU); }
-       | OP_LDH K_VLANT {
+       | OP_LDH K_VLAN_TCI {
                bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_VLAN_TAG); }
-       | OP_LDH K_VLANP {
+       | OP_LDH K_VLAN_AVAIL {
                bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); }
        | OP_LDH K_POFF {
@@ -218,6 +221,9 @@ ldh
        | OP_LDH K_RAND {
                bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_RANDOM); }
+       | OP_LDH K_VLAN_TPID {
+               bpf_set_curr_instr(BPF_LD | BPF_H | BPF_ABS, 0, 0,
+                                  SKF_AD_OFF + SKF_AD_VLAN_TPID); }
        ;
 
 ldi
@@ -262,10 +268,10 @@ ld
        | OP_LD K_CPU {
                bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_CPU); }
-       | OP_LD K_VLANT {
+       | OP_LD K_VLAN_TCI {
                bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_VLAN_TAG); }
-       | OP_LD K_VLANP {
+       | OP_LD K_VLAN_AVAIL {
                bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT); }
        | OP_LD K_POFF {
@@ -274,6 +280,9 @@ ld
        | OP_LD K_RAND {
                bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
                                   SKF_AD_OFF + SKF_AD_RANDOM); }
+       | OP_LD K_VLAN_TPID {
+               bpf_set_curr_instr(BPF_LD | BPF_W | BPF_ABS, 0, 0,
+                                  SKF_AD_OFF + SKF_AD_VLAN_TPID); }
        | OP_LD 'M' '[' number ']' {
                bpf_set_curr_instr(BPF_LD | BPF_MEM, 0, 0, $4); }
        | OP_LD '[' 'x' '+' number ']' {