Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1919500pxb; Mon, 22 Feb 2021 14:46:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyxqnennaR8RrUvO/tKjwsJfEEJIOG7K34hAY+4SPrVAkVDsoudp3cqYlcHFsyPsVNSemlh X-Received: by 2002:a50:fa85:: with SMTP id w5mr25064092edr.306.1614034018413; Mon, 22 Feb 2021 14:46:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614034018; cv=none; d=google.com; s=arc-20160816; b=eWTSBKyQtjzMtlm2dhib39oIBotBXo0Ef6/CAdkcz1iABOVA5UfE8GYc91H9JngZ5i Cg92YQYgZ5SN6ewygc9VRUwJCwfIvJKRiCTukTAk1WVBS/TVjlOD4IK09uXpr+U/8+z/ Eaw8F2YySRCL9Sivzawe/8hIsn/svto+a+haOS0dgtex4jtIkDT+6zWG9iRmnHQrq4ew tqTwNSlbbqhXzX4fFTrieTTfUo3/DLZmXJRZzUW4SaVQ03LBNcDNXSc4y9vDD+LqgFmU VbXTx8iyKfYLjLT8LgDqp66al7vnCWEa2UeAIginrLHhg+vG9XKZJpNLqtehpBSmxOEj 0MEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date; bh=H/Rs3cNKwzr8gPywle6B8S7fI75ErRXMClh32VigzAs=; b=fnhFGC7KGblHkBYnID0peZUHSmDh96CH8EedIBI1iVUTXnBNErthiEKHok0ZQBQCMn rhBrQmQGDc1YUMotBNrrBKjkCNDm1EQYfjJ8W0nQ0XwgcQs5pmd0QVMg5Yxs0OYzhQLD EZFfMattmcPtkupe2xXskeLFWNRP9eazq6cgupiGOrn6MwLvmRxWJuJtdv3LbZ7XpoSl PRuZuaxtJyVbBJc1rQOQPod5CJYAfimDPOdt5EV2DS/77QzwQhwZNL3uqqiLspzUlqx+ 8TluFaxPm7WNec20UUUdrN+IUkfjWqLzqEWuL3b1r5oI3LO8EnFh0JKLFvZiyOP8kQH8 AV5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bg8si14273368ejb.155.2021.02.22.14.46.35; Mon, 22 Feb 2021 14:46:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231933AbhBVWpI (ORCPT + 99 others); Mon, 22 Feb 2021 17:45:08 -0500 Received: from vmicros1.altlinux.org ([194.107.17.57]:33950 "EHLO vmicros1.altlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231895AbhBVWoy (ORCPT ); Mon, 22 Feb 2021 17:44:54 -0500 Received: from mua.local.altlinux.org (mua.local.altlinux.org [192.168.1.14]) by vmicros1.altlinux.org (Postfix) with ESMTP id 433F272C8B3; Tue, 23 Feb 2021 01:44:10 +0300 (MSK) Received: by mua.local.altlinux.org (Postfix, from userid 508) id 364F67CC89C; Tue, 23 Feb 2021 01:44:10 +0300 (MSK) Date: Mon, 22 Feb 2021 08:00:00 +0000 From: "Dmitry V. Levin" To: Pablo Neira Ayuso Cc: Jozsef Kadlecsik , Florian Westphal , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kernel@vger.kernel.org Subject: [PATCH] uapi: nfnetlink_cthelper.h: fix userspace compilation error Message-ID: <20210222080000.GA5900@altlinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Apparently, and could not be included into the same compilation unit because of a cut-and-paste typo in the former header. Fixes: 12f7a505331e6 ("netfilter: add user-space connection tracking helper infrastructure") Cc: # v3.6 Signed-off-by: Dmitry V. Levin --- include/uapi/linux/netfilter/nfnetlink_cthelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/netfilter/nfnetlink_cthelper.h b/include/uapi/linux/netfilter/nfnetlink_cthelper.h index a13137afc429..70af02092d16 100644 --- a/include/uapi/linux/netfilter/nfnetlink_cthelper.h +++ b/include/uapi/linux/netfilter/nfnetlink_cthelper.h @@ -5,7 +5,7 @@ #define NFCT_HELPER_STATUS_DISABLED 0 #define NFCT_HELPER_STATUS_ENABLED 1 -enum nfnl_acct_msg_types { +enum nfnl_cthelper_msg_types { NFNL_MSG_CTHELPER_NEW, NFNL_MSG_CTHELPER_GET, NFNL_MSG_CTHELPER_DEL, -- ldv