From patchwork Wed Jun 28 10:06:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 781531 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wyJNz3nLPz9s5L for ; Wed, 28 Jun 2017 20:06:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751524AbdF1KG7 (ORCPT ); Wed, 28 Jun 2017 06:06:59 -0400 Received: from Chamillionaire.breakpoint.cc ([146.0.238.67]:33358 "EHLO Chamillionaire.breakpoint.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751469AbdF1KG6 (ORCPT ); Wed, 28 Jun 2017 06:06:58 -0400 Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.84_2) (envelope-from ) id 1dQ9r9-0001kS-Vm; Wed, 28 Jun 2017 12:05:56 +0200 From: Florian Westphal To: Cc: Florian Westphal Subject: [PATCH 05/17] bison: permit 'label' on rhs side of expression Date: Wed, 28 Jun 2017 12:06:47 +0200 Message-Id: <20170628100659.26976-6-fw@strlen.de> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170628100659.26976-1-fw@strlen.de> References: <20170628100659.26976-1-fw@strlen.de> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org needed to make 'ct event set label' work, as its also a token. This change is broken: ct event set label and ct event set label,new cause conflict in grammar. Signed-off-by: Florian Westphal --- src/parser_bison.y | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parser_bison.y b/src/parser_bison.y index a95c16adde61..66f031d3ca69 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -2806,6 +2806,7 @@ keyword_expr : ETHER { $$ = symbol_value(&@$, "ether"); } | SNAT { $$ = symbol_value(&@$, "snat"); } | ECN { $$ = symbol_value(&@$, "ecn"); } | RESET { $$ = symbol_value(&@$, "reset"); } + | LABEL { $$ = symbol_value(&@$, "label"); } ; primary_rhs_expr : symbol_expr { $$ = $1; }