]> git.ipfire.org Git - thirdparty/nftables.git/commitdiff
parser_bison: simplify flowtable offload flag parser
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 31 Mar 2021 14:14:03 +0000 (16:14 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 31 Mar 2021 14:15:02 +0000 (16:15 +0200)
Remove ft_flags_spec rule.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
src/parser_bison.y

index abe117814db04121af6afe3b222db555a656c732..cc477e65672a7774901d7b711f125e7dc2fc0852 100644 (file)
@@ -1996,7 +1996,6 @@ flowtable_block_alloc     :       /* empty */
 flowtable_block                :       /* empty */     { $$ = $<flowtable>-1; }
                        |       flowtable_block common_block
                        |       flowtable_block stmt_separator
-                       |       flowtable_block ft_flags_spec   stmt_separator
                        |       flowtable_block HOOK            STRING  prio_spec       stmt_separator
                        {
                                $$->hook.loc = @3;
@@ -2019,6 +2018,10 @@ flowtable_block          :       /* empty */     { $$ = $<flowtable>-1; }
                        {
                                $$->flags |= NFT_FLOWTABLE_COUNTER;
                        }
+                       |       flowtable_block FLAGS   OFFLOAD stmt_separator
+                       {
+                               $$->flags |= FLOWTABLE_F_HW_OFFLOAD;
+                       }
                        ;
 
 flowtable_expr         :       '{'     flowtable_list_expr     '}'
@@ -2379,12 +2382,6 @@ flags_spec               :       FLAGS           OFFLOAD
                        }
                        ;
 
-ft_flags_spec          :       FLAGS           OFFLOAD
-                       {
-                               $<flowtable>0->flags |= FLOWTABLE_F_HW_OFFLOAD;
-                       }
-                       ;
-
 policy_spec            :       POLICY          policy_expr
                        {
                                if ($<chain>0->policy) {