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 Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 46897C3DA6E for ; Wed, 3 Jan 2024 10:25:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E6D56400AB; Wed, 3 Jan 2024 10:25:10 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E6D56400AB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1704277511; bh=DIAGPCK4EyPrh/Ael+oTPsoJvt+qmEkA0tC07oOAw7c=; h=From:To:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:Cc:From; b=IrRHECFabRqxIAz2VQ3YmbgSea2VXI/Xx4c8wLMEnqEUpLdcw39dPnkzPg5AmIeJh ZKmKPF+JofKqD5bKmMRFOHX01iUIaY5YWHNllvgIDgC85Zq2Ua5bHrzYaZ3lueCide dP62qb2FXuqmPLzM1rxAyNtRvL62uvRLUIaByGcsTOd3eC9zGeUE7XbXKtB2eKYouP i6Oozhls+bnVeTgm+M/TAWASoWF8CPkUSu2/cKNqONdqeS8W4I0ckWShjLL1+6KpDA FsVrBmOIlF7Cd1WrVzb9JGB0YUtiJlMB+3lzvHu/0W23lZVSd4p0fuNWe1Pu6Hrn0j K/dJOJmmuPhWQ== X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zrxE5_GT1BEW; Wed, 3 Jan 2024 10:25:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id EE4474021C; Wed, 3 Jan 2024 10:25:09 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org EE4474021C Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id BB9DC1BF409 for ; Wed, 3 Jan 2024 10:25:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 91FD64021C for ; Wed, 3 Jan 2024 10:25:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 91FD64021C X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GL3KKcZ-v6fP for ; Wed, 3 Jan 2024 10:25:06 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by smtp2.osuosl.org (Postfix) with ESMTPS id B18ED400AB for ; Wed, 3 Jan 2024 10:25:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B18ED400AB Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 613C461359; Wed, 3 Jan 2024 10:25:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AD08C433C7; Wed, 3 Jan 2024 10:25:01 +0000 (UTC) From: Arnd Bergmann To: Jesse Brandeburg , Tony Nguyen , Jakub Kicinski Date: Wed, 3 Jan 2024 11:24:45 +0100 Message-Id: <20240103102458.3687963-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704277505; bh=5Rcik7t02gBhfvqwKpMZbmbnkEm1DrJkNCgPCnScgEk=; h=From:To:Cc:Subject:Date:From; b=U4vF7p7qcZWkkoYObZ9qmo2ktv6FBoq5E+Xg7MNFl/frEzm3aIqjASJ43SafT9eKK 5IpbXaxOjjl2lG+Id2vXcO69Qnn/0YAhjb84cjlPKoLCILW2XNFu2U1rcuOlq4dcoq w43AbxgDl5V+UczWqL6v4oxgftsQLFHgtEkPerbGCx8S1X/6YinQsr/yZNRC4IEyKP G0yuGTqTW1EMaW9hLA6taWKxbt8/XFwaRURbi2jLF1wbbmILn45J7uMQZtIl22ZHY6 JY0gphYd0AggEXOrhAG6CljcM7VTkiKGh7focQO0U3x1GUyvy21GwKiAa+j8JWLNYm rMlwxDkzRsmkg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=U4vF7p7q Subject: [Intel-wired-lan] [PATCH] ice: fix building withouto XDP X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maciej Fijalkowski , Daniel Borkmann , Arnd Bergmann , Larysa Zaremba , netdev@vger.kernel.org, Alexei Starovoitov , Amritha Nambiar , Eric Dumazet , intel-wired-lan@lists.osuosl.org, Simon Horman , Paolo Abeni , Piotr Raczynski , "David S. Miller" , linux-kernel@vger.kernel.org Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Arnd Bergmann The newly added function fails to build when struct xsk_cb_desc is not defined: drivers/net/ethernet/intel/ice/ice_base.c: In function 'ice_xsk_pool_fill_cb': drivers/net/ethernet/intel/ice/ice_base.c:525:16: error: variable 'desc' has initializer but incomplete type Hide this part in the same #ifdef that controls the structure definition. Fixes: d68d707dcbbf ("ice: Support XDP hints in AF_XDP ZC mode") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/intel/ice/ice_base.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c index 6e3694145f59..0d1aeb7ca108 100644 --- a/drivers/net/ethernet/intel/ice/ice_base.c +++ b/drivers/net/ethernet/intel/ice/ice_base.c @@ -521,6 +521,7 @@ static int ice_setup_rx_ctx(struct ice_rx_ring *ring) static void ice_xsk_pool_fill_cb(struct ice_rx_ring *ring) { +#ifdef CONFIG_XDP_SOCKETS void *ctx_ptr = &ring->pkt_ctx; struct xsk_cb_desc desc = {}; @@ -530,6 +531,7 @@ static void ice_xsk_pool_fill_cb(struct ice_rx_ring *ring) sizeof(struct xdp_buff); desc.bytes = sizeof(ctx_ptr); xsk_pool_fill_cb(ring->xsk_pool, &desc); +#endif } /** -- 2.39.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7DAD318AF6; Wed, 3 Jan 2024 10:25:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="U4vF7p7q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AD08C433C7; Wed, 3 Jan 2024 10:25:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704277505; bh=5Rcik7t02gBhfvqwKpMZbmbnkEm1DrJkNCgPCnScgEk=; h=From:To:Cc:Subject:Date:From; b=U4vF7p7qcZWkkoYObZ9qmo2ktv6FBoq5E+Xg7MNFl/frEzm3aIqjASJ43SafT9eKK 5IpbXaxOjjl2lG+Id2vXcO69Qnn/0YAhjb84cjlPKoLCILW2XNFu2U1rcuOlq4dcoq w43AbxgDl5V+UczWqL6v4oxgftsQLFHgtEkPerbGCx8S1X/6YinQsr/yZNRC4IEyKP G0yuGTqTW1EMaW9hLA6taWKxbt8/XFwaRURbi2jLF1wbbmILn45J7uMQZtIl22ZHY6 JY0gphYd0AggEXOrhAG6CljcM7VTkiKGh7focQO0U3x1GUyvy21GwKiAa+j8JWLNYm rMlwxDkzRsmkg== From: Arnd Bergmann To: Jesse Brandeburg , Tony Nguyen , Jakub Kicinski Cc: Arnd Bergmann , "David S. Miller" , Eric Dumazet , Paolo Abeni , Maciej Fijalkowski , Simon Horman , Daniel Borkmann , Larysa Zaremba , Piotr Raczynski , Amritha Nambiar , Alexei Starovoitov , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ice: fix building withouto XDP Date: Wed, 3 Jan 2024 11:24:45 +0100 Message-Id: <20240103102458.3687963-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnd Bergmann The newly added function fails to build when struct xsk_cb_desc is not defined: drivers/net/ethernet/intel/ice/ice_base.c: In function 'ice_xsk_pool_fill_cb': drivers/net/ethernet/intel/ice/ice_base.c:525:16: error: variable 'desc' has initializer but incomplete type Hide this part in the same #ifdef that controls the structure definition. Fixes: d68d707dcbbf ("ice: Support XDP hints in AF_XDP ZC mode") Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/intel/ice/ice_base.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c index 6e3694145f59..0d1aeb7ca108 100644 --- a/drivers/net/ethernet/intel/ice/ice_base.c +++ b/drivers/net/ethernet/intel/ice/ice_base.c @@ -521,6 +521,7 @@ static int ice_setup_rx_ctx(struct ice_rx_ring *ring) static void ice_xsk_pool_fill_cb(struct ice_rx_ring *ring) { +#ifdef CONFIG_XDP_SOCKETS void *ctx_ptr = &ring->pkt_ctx; struct xsk_cb_desc desc = {}; @@ -530,6 +531,7 @@ static void ice_xsk_pool_fill_cb(struct ice_rx_ring *ring) sizeof(struct xdp_buff); desc.bytes = sizeof(ctx_ptr); xsk_pool_fill_cb(ring->xsk_pool, &desc); +#endif } /** -- 2.39.2