From patchwork Tue Jul 18 19:38:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 122210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1972579vqt; Tue, 18 Jul 2023 12:50:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlGZd4Fi7a77F2XDeHKv7bzlBRE9xb2KBPs+ecu/erYSxIwdZ6U8Nnxh33XcdGdJPnI4Er8X X-Received: by 2002:a17:906:15d:b0:993:ea6b:edf6 with SMTP id 29-20020a170906015d00b00993ea6bedf6mr628543ejh.0.1689709808818; Tue, 18 Jul 2023 12:50:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689709808; cv=none; d=google.com; s=arc-20160816; b=ZabheLgBB+ZzCPwvlV1Ak5gpw2djzaEniXQ3d815z1w4cFf6vSNNEzo7O1Db3jF03o OtX0askTu/UZtbg6RHPjod4EGQwsy+NQLW4TJerJ7M3l7/DJTgAY7W+WhIh3NxdMGDoZ 7O1qmUjARWM3Y/s/pnuMG5ZWEuOy8Gz44qaW/uVE4MKvoobCv1jf3esCUTAqqBI/V1CL fhDhgmtvVD0T6/qOT/jjB80OxTy4574FcItgz3NluiFHc26gbhM5/HRjFWrGt4WY4VCo hza6kv+AVvEwoOkdYApm5cO04hmsiuUMJV8H5rKwl/b7iA7oiXMddQ5nFWJ713kDZi82 ROnw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=3BsHPF0kl6vyqy2klBV5zBESgJ/EHLqtTL5r9R6T2dY=; fh=piPFs1t7Im+WjWm7UV5Ccb8CvcvdJsLkfhyqPZYsHGY=; b=inKtepTP+FZknRxcc1zlmOwsoRz5GmEBYcVQe01NrOgDSig8EO7pVSXHa9P71VMY8M D/jlRgLP4hZz9f251L1l0k/iOBf20yd4mdbEycmD95Vw3TJyA2fbFk2lIz+LoXtncN4b i3+IeW4KKklkwKzYsTWjvGqssxsHz7gb+JDomTg/2j06R8UUt9fuI4slEwUWe5LvO5RX dBVdbxtDJMimBhaeE7d/xzsvZcwzLbcoxaVbfZMZPhFHcKcikBk1644tQjHL3WJ2YHvV tAe7yH1gQaK3veSKhofaSihXrBoNuP3LLxpdsr3RdcGvTuLuAxva7h4SZ5g7yvTEx4KE bfAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qbUdNt0T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h3-20020a1709060f4300b009885217c85bsi60643ejj.275.2023.07.18.12.49.44; Tue, 18 Jul 2023 12:50:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qbUdNt0T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230268AbjGRTiq (ORCPT + 99 others); Tue, 18 Jul 2023 15:38:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229703AbjGRTim (ORCPT ); Tue, 18 Jul 2023 15:38:42 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1987B198D; Tue, 18 Jul 2023 12:38:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 8780260B37; Tue, 18 Jul 2023 19:38:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E107C433C9; Tue, 18 Jul 2023 19:38:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689709121; bh=kzd2rPYeONsTGcisNSQCTbZ1KZDmI2Fzfp5ybHEHHhk=; h=From:To:Cc:Subject:Date:From; b=qbUdNt0Tdh4z7wEi0XAxrHcU0cwijNx2zRehOst1OpRlf4ROlwg2p/VgAiadfEY+W vWE/pI3stzSzKPXks+O9NYMPOVczKS+AUtHkvSb7q/jE39i5KtByD45wXB87L8+Gpp WpA21WK8Zk7sRtwYdma7R3x9aDxpMnDNPeanLccREdUAfNcdhqCvQpnhL7i1D64gMO MmnWUtquZE5NoBwF/rzQbWH7qXGaxZ4wJEl1Kf+A2z/TTN8Mk0pzue4N7I1TVRyyWH mJLvguxdor0J3t45oZ04luq0TTOsc+TuqCTQ3/lWFlnQoOhxpr9nvUMfCOmXkSGlM0 XJHUmhkboxCjA== From: Arnd Bergmann To: Mustafa Ismail , Shiraz Saleem , Jason Gunthorpe , Leon Romanovsky Cc: Arnd Bergmann , Sindhu Devale , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] RDMA/irdma: fix building without IPv6 Date: Tue, 18 Jul 2023 21:38:09 +0200 Message-Id: <20230718193835.3546684-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771789152751250274 X-GMAIL-MSGID: 1771789152751250274 From: Arnd Bergmann The new irdma_iw_get_vlan_prio() function requires IPv6 support to build: x86_64-linux-ld: drivers/infiniband/hw/irdma/cm.o: in function `irdma_iw_get_vlan_prio': cm.c:(.text+0x2832): undefined reference to `ipv6_chk_addr' Add a compile-time check in the same way as elsewhere in this file to avoid this by conditionally leaving out the ipv6 specific bits. Fixes: f877f22ac1e9b ("RDMA/irdma: Implement egress VLAN priority") Signed-off-by: Arnd Bergmann Acked-by: Shiraz Saleem --- drivers/infiniband/hw/irdma/cm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/irdma/cm.c b/drivers/infiniband/hw/irdma/cm.c index 6b71b67ce9ff0..8ea55c6a3fba5 100644 --- a/drivers/infiniband/hw/irdma/cm.c +++ b/drivers/infiniband/hw/irdma/cm.c @@ -1562,7 +1562,7 @@ static u8 irdma_iw_get_vlan_prio(u32 *loc_addr, u8 prio, bool ipv4) rcu_read_lock(); if (ipv4) { ndev = ip_dev_find(&init_net, htonl(loc_addr[0])); - } else { + } else if (IS_ENABLED(CONFIG_IPV6)) { struct net_device *ip_dev; struct in6_addr laddr6;