From patchwork Wed Apr 29 09:14:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miroslav Kratochvil X-Patchwork-Id: 465953 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 CA4CB1402BC for ; Wed, 29 Apr 2015 19:15:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=KstoZkjf; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031678AbbD2JO7 (ORCPT ); Wed, 29 Apr 2015 05:14:59 -0400 Received: from mail-lb0-f182.google.com ([209.85.217.182]:32889 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031668AbbD2JO5 (ORCPT ); Wed, 29 Apr 2015 05:14:57 -0400 Received: by lbbzk7 with SMTP id zk7so15488816lbb.0 for ; Wed, 29 Apr 2015 02:14:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=Q8cGrlWShIxAB0WoLfarql/1MmvemiqSK2uQxgEsMEA=; b=KstoZkjf3JFmDN/eO0zws7mOCSDsOQwZj3+jBINh380mW6TAQYGFlOoAOFSro5nJ7N iZesQdXqE3JOA52gYZ+X3nxYuaVsuUNCD8zldkoWFXlv/TR+CUi5x8Ot2gJfWoydECuF amVmCu3ssWFQdsPhTlK6FJhI9fQ37gy/itGGNMrXqIB+VpFrtc4AzT31wRJSDqJwaetn wqxZOtI7FACWNzoaZ67iHx/D0J0uSC876ZodBGYVvcqRxg9UKbhel0KFSLlujZwd3Nq+ N4U17GNyrGxNnOf4eoGqUR8hKFWu/uVd2YTyKcWM+UhcqHRK4Lh+VkobA86PqtSfKZSE lNXw== MIME-Version: 1.0 X-Received: by 10.152.88.80 with SMTP id be16mr9073766lab.39.1430298896142; Wed, 29 Apr 2015 02:14:56 -0700 (PDT) Received: by 10.112.204.137 with HTTP; Wed, 29 Apr 2015 02:14:56 -0700 (PDT) Date: Wed, 29 Apr 2015 11:14:56 +0200 Message-ID: Subject: [PATCH nft] datatype: fix packet mark type name From: Miroslav Kratochvil To: netfilter-devel@vger.kernel.org Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Original was conflicting with "mark" keyword from scanner.l, preventing creation of named sets with this type. Ref.: https://bugzilla.netfilter.org/show_bug.cgi?id=1012 --- src/datatype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) .byteorder = BYTEORDER_HOST_ENDIAN, diff --git a/src/datatype.c b/src/datatype.c index c93f76a..d204ed1 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -686,7 +686,7 @@ static struct error_record *mark_type_parse(const struct expr *sym, const struct datatype mark_type = { .type = TYPE_MARK, - .name = "mark", + .name = "packetmark", .desc = "packet mark", .size = 4 * BITS_PER_BYTE,