From patchwork Fri Apr 11 13:51:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick McHardy X-Patchwork-Id: 338515 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 F3BC114008E for ; Fri, 11 Apr 2014 23:51:47 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932329AbaDKNvb (ORCPT ); Fri, 11 Apr 2014 09:51:31 -0400 Received: from stinky.trash.net ([213.144.137.162]:33237 "EHLO stinky.trash.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932072AbaDKNv2 (ORCPT ); Fri, 11 Apr 2014 09:51:28 -0400 Received: from macbook.localnet (unknown [127.0.0.1]) by stinky.trash.net (Postfix) with ESMTP id 0DDFD9D2DD; Fri, 11 Apr 2014 15:51:26 +0200 (MEST) From: Patrick McHardy To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org Subject: [PATCH] parser: fix ether keyword clash Date: Fri, 11 Apr 2014 15:51:11 +0200 Message-Id: <1397224271-4507-1-git-send-email-kaber@trash.net> X-Mailer: git-send-email 1.9.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Due to the renaming of the "eth" keyword to "ether", parsing of arphrd type "ether" fails. Fix similar to TCP, UDP etc by allocating a constant arphrd expression for the ether keyword without a following key. Signed-off-by: Patrick McHardy --- src/parser.y | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/parser.y b/src/parser.y index af34857..de5c0ed 100644 --- a/src/parser.y +++ b/src/parser.y @@ -1639,6 +1639,13 @@ eth_hdr_expr : ETHER eth_hdr_field { $$ = payload_expr_alloc(&@$, &proto_eth, $2); } + | ETHER + { + uint16_t data = ARPHRD_ETHER; + $$ = constant_expr_alloc(&@$, &arphrd_type, + BYTEORDER_BIG_ENDIAN, + sizeof(data) * BITS_PER_BYTE, &data); + } ; eth_hdr_field : SADDR { $$ = ETHHDR_SADDR; }