Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3319509pxf; Mon, 15 Mar 2021 07:04:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZt1CpeZq40EBz0MtB9gk21FZtMBrC/DaMoIYo/DrVmV1EXs2kY+cRE5YQuk0LNHJFOLIQ X-Received: by 2002:a17:906:7194:: with SMTP id h20mr23766737ejk.154.1615817073986; Mon, 15 Mar 2021 07:04:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615817073; cv=none; d=google.com; s=arc-20160816; b=U5T9hEyzpPgt/bYZHzIW0F5udx+JsOztqJjT7cbA28eGaebUp2WNvvUfE745zfbGIk v8wLM6IRNeLoJWMJCulAfHZagMq7g31iz5w12OkfIWf2rSfcIMjDWypQEUG4Sw6rzTwk gte2RRYllTD3n5hMK3o9w8Vzp/Gl9UUAxroMj8PCjSv7AAnKVr8x9KfREpPBeZADMCce lM35nraDhIl+1G/HHmbCMNIzeJPy6UmlGhQ25+vugaJFuPcYY7KfPE1atoUTx65R1kM7 /7tlZZrObo4MOLTRHIVW42zS0aimImHzDNLSRwSibFaGGcaTmrg/h2UCqusdp+zRwhFY 0tPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OSHMcWSczbAuPGJazASbtdcHp0VUI5R/E8+31w2GqIE=; b=rcxyUesi6GddIrH8WNMjcrRnC+glrFuteDZ3Ef6bwoiseen0kqVnnBInutjL5Us9f+ DH8LlcSEOT0rxBNwOpz6wVhDkW30t4CxKtf2N5lFvyBznK9g7RAtXU1K2s35aWSMRkwi UDDPyP7YsqMCQE9apxKCw6+L+c6YjHwWKCH49bHTVMjcKNi19KJKc4nfrQrqx8CTBe/L RjRpP51PgRSXIQnk+LqZwum6DI+fN9ZWz1idO8+moKVVOXP6scvOaj/ywxWRlcKYnytr y0QlxvyRIpngJrhbXK64bovN8WqKFO8+T1gciXVjZ+QaFA8TRAGFD1kwuuRox83cgnaT csWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VWg+jwVN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b68si12297771edf.477.2021.03.15.07.04.10; Mon, 15 Mar 2021 07:04:33 -0700 (PDT) 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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VWg+jwVN; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230500AbhCOOB4 (ORCPT + 99 others); Mon, 15 Mar 2021 10:01:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:33286 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230330AbhCON4r (ORCPT ); Mon, 15 Mar 2021 09:56:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 774FD64EB6; Mon, 15 Mar 2021 13:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816606; bh=sdWnjAJvlnqJ2n9U+Zkd63cqwHEfAh4fXY7VV+tHcpE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VWg+jwVNnfQjT9OLEq8jON/Ld+7222HgwrYczzMtTsCjKLy28cN5fTiJV1eX07C9j fyAyb50dwDZqkTXoKFIoU7LhQohmgmaJswlk4mLCauxIbgAFjwS6+/kQ7VXzLySpmi sCIFIHIWSy02qiW4b0zE3cBQHwGD8/XvOhfoAyqA= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Dmitry V. Levin" , Pablo Neira Ayuso Subject: [PATCH 5.4 001/168] uapi: nfnetlink_cthelper.h: fix userspace compilation error Date: Mon, 15 Mar 2021 14:53:53 +0100 Message-Id: <20210315135550.382080702@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135550.333963635@linuxfoundation.org> References: <20210315135550.333963635@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Dmitry V. Levin commit c33cb0020ee6dd96cc9976d6085a7d8422f6dbed upstream. 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 Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- include/uapi/linux/netfilter/nfnetlink_cthelper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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,