From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 28336A0543 for ; Mon, 6 Jun 2022 12:47:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D90641181; Mon, 6 Jun 2022 12:47:07 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mails.dpdk.org (Postfix) with ESMTP id 45EB340150; Mon, 6 Jun 2022 12:47:05 +0200 (CEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 918D25C01A7; Mon, 6 Jun 2022 06:47:04 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 06 Jun 2022 06:47:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1654512424; x= 1654598824; bh=GUJR5qF8O3YCJ11Obwzi3Q/r5J/T4Nt/dOpgFjbfYhA=; b=i NPv4HlHRWlzZj+aZse7lmHEhFd4RXBC7pJvl1rNxi8wPTWxuE0SxNhU24cEGzETn KYepDQNdfUwwa/1N/DGoze9nr0pdiSkQ0sqJnQUkPooX3MExQHKQ69DO3Cbysug/ 3tMrfFlfHvK99shnCzXBkjeRu1OCh1YS9/52gKjKpOBSgH1uRtB/P82V9XspA6FY aX4LxrFh5GDIpmNmXFJ8yghbbV+BiMgs5BhmlgqYiwUesb0OhywzMUM8+BavwQ2s X/FhZNgiNb7tGwbnU/uHfqxbhPcDJAnR3MV76gM53PbebNsWZV4rYpocss4llrR7 o3fDlyl3Thio+0mwsHxww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1654512424; x= 1654598824; bh=GUJR5qF8O3YCJ11Obwzi3Q/r5J/T4Nt/dOpgFjbfYhA=; b=P OKZhqtsmAP/ihrmGlAfxJr1ZdDy7Zw/amu6pej8o4TSEsSl4qIeKLUwTnmV2cpF/ q5x/MZhBGtxIg5QePQgbzYtADo3J3JJVZcg6kR4TDfm4iJRMDWY4YScxgfvbCf18 TWHrFf1EB6zgHPrZx/2loHdrOhsTcBhI9xaxFuUO47oGQ5mz6YGQmuZmy70MByxd x5yhLl3LSbkmUFln/EbsBQC7YlAlsiegJMuHSja9Ka8HNYI7xx6JkeGqmSWjp8rb XRzPxycPMnO/SOQkVHqnH2gCoJO039LsrbKfWCYRPYlLqV1bBTY9EGJg51Da9eth v1vLVjwlbFuK3HAknCgEw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddtvddgfeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpefvhhho mhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqne cuggftrfgrthhtvghrnheptdeiffffgeefteelhfekueetueduffejgfelvedtieejudek gfevheetheehgeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 6 Jun 2022 06:47:03 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: daxuex.gao@intel.com, stable@dpdk.org, Andrew Rybchenko , Jiri Slaby Subject: [PATCH] kni: fix build Date: Mon, 6 Jun 2022 12:46:44 +0200 Message-Id: <20220606104644.1477620-1-thomas@monjalon.net> X-Mailer: git-send-email 2.36.0 In-Reply-To: <88cd54ca-9318-d240-4ce9-2be8b13d19ad@oktetlabs.ru> References: <88cd54ca-9318-d240-4ce9-2be8b13d19ad@oktetlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org A previous fix had #else instead of #endif. The error message is: kernel/linux/kni/kni_net.c: In function ‘kni_net_rx_normal’: kernel/linux/kni/kni_net.c:448:2: error: #else after #else Bugzilla ID: 1025 Fixes: c98600d4bed6 ("kni: fix build with Linux 5.18") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon --- kernel/linux/kni/kni_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c index a8b092b756..41805fcabf 100644 --- a/kernel/linux/kni/kni_net.c +++ b/kernel/linux/kni/kni_net.c @@ -445,7 +445,7 @@ kni_net_rx_normal(struct kni_dev *kni) netif_rx_ni(skb); #else netif_rx(skb); -#else +#endif /* Update statistics */ dev->stats.rx_bytes += len; -- 2.36.0