From patchwork Sat Jun 4 22:33:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nevola X-Patchwork-Id: 630317 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 3rMbN24cNDz9t6X for ; Sun, 5 Jun 2016 08:33:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=TypkPJ5X; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751326AbcFDWdh (ORCPT ); Sat, 4 Jun 2016 18:33:37 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36402 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750938AbcFDWdg (ORCPT ); Sat, 4 Jun 2016 18:33:36 -0400 Received: by mail-wm0-f68.google.com with SMTP id m124so6379313wme.3 for ; Sat, 04 Jun 2016 15:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=UhiNuAyVFgk1YiHsC6H7JZTaaXmA31Vj6gl93vh+7cQ=; b=TypkPJ5XfhI+PboVj8nikPUIbdVpRxofjUxpyJVLHvEva1Dby3lX2aFPDNT55VyQYU RhoOxDg90Pit8zNuviKqPwHxG47/bORjV6fSckbhFEW7m8OxLVg/TcZAp/4J6kcDlmJA Y+gLlhJIEDTtwN/AjZP6I4vKx463BP76nNag2UyM1o3+2+13aOcZIUbAuRYTKFyZefxH 9tVTzqK7VaVmaHY5HZb67mGI5lccoOhq0V2ZvESIoL/a6OjIjRiUL4rUxguGGKqpt2kt efyf7y3fyYijeTixZSPqN+WoUAnDF4YWzWzQdj6CYZUe1nUYUkoNEIgsstuJCKZCMOy1 WGfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=UhiNuAyVFgk1YiHsC6H7JZTaaXmA31Vj6gl93vh+7cQ=; b=X/GDFw/Id0feOmfP923+FTEQO3lphe3bHZ4czK1dCoVuKPvJ0lN7MrQkqdjfoF5LWo HOw6WG9/GYklmv5iZCLeUc0aXrXUpC3NwIzpw8SZ7Fal7VcOU5EONEaU5l73ZJn3mOrJ b2ASoeloIs3oC5B195JO/zzyeffQbLIP4o3ey55C7uWhm2YPG1B/bfRRf1LhuhEGGpO6 8q2m1iveQ7O9kqO/MloSmqzlbu//HDXblMfjzPvMHu8odPUyjfiDsyy9hIiObUc9PeEn RoEIlekz5+PCm7xVZ9SPXCWlCf/uvr0/dBct8NXS3Jme1unrfcyUEGdje41vlXgWqFtR aWVQ== X-Gm-Message-State: ALyK8tIYoP0g+q6t+AMuVIMgw3MMtews+42AXPDU3eEdNJ9kYj13Y07Z6UcM8qLaIcZ7lQ== X-Received: by 10.28.88.206 with SMTP id m197mr4928956wmb.43.1465079614960; Sat, 04 Jun 2016 15:33:34 -0700 (PDT) Received: from sonyv (128.red-176-84-210.dynamicip.rima-tde.net. [176.84.210.128]) by smtp.gmail.com with ESMTPSA id y3sm12525579wji.40.2016.06.04.15.33.33 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sat, 04 Jun 2016 15:33:33 -0700 (PDT) Date: Sun, 5 Jun 2016 00:33:31 +0200 From: Laura Garcia Liebana To: netfilter-devel@vger.kernel.org Subject: [PATCH] doc: Update datatypes Message-ID: <20160604223328.GA30197@sonyv> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Check and update nft parameter datatypes. Signed-off-by: Laura Garcia Liebana --- doc/nft.xml | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/doc/nft.xml b/doc/nft.xml index b9f3c69..ea47e2b 100644 --- a/doc/nft.xml +++ b/doc/nft.xml @@ -1029,12 +1029,12 @@ filter output ip6 daddr ::1 priority TC packet priority - integer (32 bit) + tc_handle mark Packet mark - packetmark + mark iif @@ -1104,12 +1104,12 @@ filter output ip6 daddr ::1 iifgroup incoming device group - devgroup_type + devgroup oifgroup outgoing device group - devgroup_type + devgroup cgroup @@ -1287,7 +1287,7 @@ filter output oif eth0 cfi Canonical Format Indicator - flag + integer (1 bit) pcp @@ -1297,7 +1297,7 @@ filter output oif eth0 type EtherType - ethertype + ether_type @@ -1336,7 +1336,7 @@ filter output oif eth0 ptype EtherType - ethertype + ether_type hlen @@ -1395,12 +1395,12 @@ filter output oif eth0 dscp Differentiated Services Code Point - integer (6 bit) + dscp ecn Explicit Congestion Notification - integer (2 bit) + ecn length @@ -1477,19 +1477,14 @@ filter output oif eth0 integer (4 bit) - priority - - - - dscp Differentiated Services Code Point - integer (6 bit) + dscp ecn Explicit Congestion Notification - integer (2 bit) + ecn flowlabel @@ -1583,7 +1578,7 @@ filter output oif eth0 flags TCP flags - tcp_flags + tcp_flag window @@ -1689,11 +1684,6 @@ filter output oif eth0 inet_service - cscov - Checksum coverage - integer (16 bit) - - checksum Checksum integer (16 bit) @@ -1819,7 +1809,7 @@ filter output oif eth0 nexthdr Next header protocol - inet_service + inet_proto hdrlength @@ -1829,7 +1819,7 @@ filter output oif eth0 reserved Reserved area - integer (4 bit) + integer (16 bit) spi @@ -1912,7 +1902,7 @@ filter output oif eth0 nexthdr Next header protocol - inet_service + inet_proto flags @@ -2015,7 +2005,7 @@ filter output oif eth0 mark Connection mark - packetmark + mark expiration