From patchwork Mon Feb 24 13:12:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1243064 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=azazel.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20190108 header.b=G/aQ9h2d; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48R2XN67Cbz9sRQ for ; Tue, 25 Feb 2020 00:12:04 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727448AbgBXNMD (ORCPT ); Mon, 24 Feb 2020 08:12:03 -0500 Received: from kadath.azazel.net ([81.187.231.250]:58258 "EHLO kadath.azazel.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727393AbgBXNMD (ORCPT ); Mon, 24 Feb 2020 08:12:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=u5Xj54wNsouiaQG2C3G1asAwvwl/5AJR12w34FQqm2E=; b=G/aQ9h2d0AsPaOIKYnYfJ5DlMM PM5BOmouuAJ1UyRS7TceGIjH0w3SvPa0+SXu36LduhPGAUzvIkvKqomFvkdGyVRIwyF49w1RVWpiL PJ7RU70ZGHHO48SUo1uIOLdEuc8Wry+2WaN5DBYeoq+RUBRvWeCUtEnBsPIy8zmHfz/1D2/XDU//E sBXmVKcBueioPUSJsPsAS17kZNW7q+UKQzwCjB6vJk0L8liHGJdPNij1H82ebzpzFPZlcSJ2KnuqQ GEsljUKC1WiWDqhXt023qJnGluSGejHT8CRV3IFDvq9+D/vRFVhYaIVGyHHxr2YqpnNOJ7gxd9zxU oQQENtAA==; Received: from [2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae] (helo=ulthar.dreamlands) by kadath.azazel.net with esmtp (Exim 4.92) (envelope-from ) id 1j6DWk-0001wB-2L; Mon, 24 Feb 2020 13:12:02 +0000 From: Jeremy Sowden To: Pablo Neira Ayuso , Florian Westphal Cc: Netfilter Devel Subject: [PATCH libnftnl 2/3] include: update nf_tables.h. Date: Mon, 24 Feb 2020 13:12:00 +0000 Message-Id: <20200224131201.512755-3-jeremy@azazel.net> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200224131201.512755-1-jeremy@azazel.net> References: <20200224131201.512755-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Pick up a couple of new bitwise netlink attributes. Signed-off-by: Jeremy Sowden --- include/linux/netfilter/nf_tables.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 065218a20bb7..57e83e152bf3 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -526,6 +526,8 @@ enum nft_bitwise_ops { * @NFTA_BITWISE_OP: type of operation (NLA_U32: nft_bitwise_ops) * @NFTA_BITWISE_DATA: argument for non-boolean operations * (NLA_NESTED: nft_data_attributes) + * @NFTA_BITWISE_MREG: mask register (NLA_U32: nft_registers) + * @NFTA_BITWISE_XREG: xor register (NLA_U32: nft_registers) * * The bitwise expression supports boolean and shift operations. It implements * the boolean operations by performing the following operation: @@ -549,6 +551,8 @@ enum nft_bitwise_attributes { NFTA_BITWISE_XOR, NFTA_BITWISE_OP, NFTA_BITWISE_DATA, + NFTA_BITWISE_MREG, + NFTA_BITWISE_XREG, __NFTA_BITWISE_MAX }; #define NFTA_BITWISE_MAX (__NFTA_BITWISE_MAX - 1)