From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8F2F7C2D0DB for ; Fri, 24 Jan 2020 11:20:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A1D1206D5 for ; Fri, 24 Jan 2020 11:20:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864851; bh=eWyQCUum57864Lrr+ixe+YZ2NxOYY9VKc0e8YZEM39o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=otgEUamyzb/lA1KJN57zNf0SmMnlq9Sts74HUogaQSnLuQA3Ok2o64Hbw9YIVZ9Xq j1ElBCy33wF7hoCXiWLcusX1czaEr+2NCdnvappd+CNP44W3wcuBY9tSPkWr0a/7r+ dNQ/M5EQ+xCGv9w9vczVPSAB1WX7iX/AND38Ok/0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390637AbgAXLUt (ORCPT ); Fri, 24 Jan 2020 06:20:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:58622 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390751AbgAXLUr (ORCPT ); Fri, 24 Jan 2020 06:20:47 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DC657206D4; Fri, 24 Jan 2020 11:20:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864846; bh=eWyQCUum57864Lrr+ixe+YZ2NxOYY9VKc0e8YZEM39o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VKhigGQOy/3wcMUtqQZAMivXbDNBBfnFlka7WCaNie02nTrBiq/VHLJ8rQHKd7JIl /jeUJGdNyIkLuI2mA1vl24QSHlG6GDLRL5/GUHZN7JtlgqA7IIstObYml+uhjrVntB 5Sc8oOulzPYf9Vi5T3RjAOaFPlHG3ST+BfA/cqKI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Westphal , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 4.19 370/639] netfilter: nf_tables: correct NFT_LOGLEVEL_MAX value Date: Fri, 24 Jan 2020 10:29:00 +0100 Message-Id: <20200124093133.398042147@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Florian Westphal [ Upstream commit 92285a079eedfe104a773a7c4293f77a01f456fb ] should be same as NFT_LOGLEVEL_AUDIT, so use -, not +. Fixes: 7eced5ab5a73 ("netfilter: nf_tables: add NFT_LOGLEVEL_* enumeration and use it") Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- include/uapi/linux/netfilter/nf_tables.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h index 325ec6ef0a764..5eac62e1b68d5 100644 --- a/include/uapi/linux/netfilter/nf_tables.h +++ b/include/uapi/linux/netfilter/nf_tables.h @@ -1128,7 +1128,7 @@ enum nft_log_level { NFT_LOGLEVEL_AUDIT, __NFT_LOGLEVEL_MAX }; -#define NFT_LOGLEVEL_MAX (__NFT_LOGLEVEL_MAX + 1) +#define NFT_LOGLEVEL_MAX (__NFT_LOGLEVEL_MAX - 1) /** * enum nft_queue_attributes - nf_tables queue expression netlink attributes -- 2.20.1