From patchwork Tue Sep 5 14:59:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 111691 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp5592277ybm; Tue, 5 Sep 2017 08:00:10 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5t0xmMfiiViS3lwF2xTXSH+zbjOcch639ec92rTN+BUFrCEF/izLKMc4vctfIhpFlfGUF0 X-Received: by 10.98.205.75 with SMTP id o72mr4183130pfg.74.1504623610504; Tue, 05 Sep 2017 08:00:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504623610; cv=none; d=google.com; s=arc-20160816; b=vTLyb+ZKAhPNJT1C3KQUplFW/V90eOCpHWMSdUnhSUhzHatGvoc0WU2QSdEK93NPAV jwsivVMlupCDuVpZY+ZE0mmDbxGwiwYqkIm/LcKJgef16dLMLUzlxSeqWtIu2QDovVib I978QbfwN7epxxkT7DUxUtPW+1qhFcsOvER1WG3LIjtpBRgjL0UaZ1CZGpYTOhdR88vo 0bJDfBdrhvKymwRfxTpksrrqzTWEmSMYECZXgSvXwMWD78xJ3s8XB3f6tKq6Zp2H2Bcs TvwFAldU0XX+uL/7PRqAwv0KWnENe0YRfWpB88Mhy2NXKt974Wum5q9eHjXrmWKAQ9eb gw7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=bMdlpXiCRmOdVh6t5HJgeJpRTFoU/hquxLA2eopN0Yw=; b=uzYV8kSWgB1Z/UtAbiQL8lIjvlK/q+p9K54G7SyPYrU7EJAxJHYhbBgmLTe93A/ZO5 zN3PjuleRcQ5AElmv4Tk7wrnyoslA89pyTy9oC0BkXaBchJbEZSW/vOgj9L5VpIQo9To p9T78oTe+6r4x7sXkktRRXV2mBMojq5Z6DdpdoBFwO9bZWCMvVBcMP8W9IIENRYuURqh tAiOPBVXCKUE3mqidMJ4waXKaa6q7XfsxlOH9XRE+ydC3sAgFomwmEGU3ic5mP7qmZI2 F8yUs2BDLJ4YkIhs86FWX0IgMukjWcwkGAKbZXjWJt7z7Z/AREUYkkmqtBc1dSjINiYE eu9Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v5si560985plk.437.2017.09.05.08.00.10; Tue, 05 Sep 2017 08:00:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751953AbdIEPAJ (ORCPT + 26 others); Tue, 5 Sep 2017 11:00:09 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56229 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751490AbdIEPAE (ORCPT ); Tue, 5 Sep 2017 11:00:04 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0M8dKp-1dbgLY3lkB-00wEqx; Tue, 05 Sep 2017 16:59:40 +0200 From: Arnd Bergmann To: Ram Amrani , Michal Kalderon , Ariel Elior , Doug Ledford , Sean Hefty , Hal Rosenstock Cc: Arnd Bergmann , "David S. Miller" , "Mintz, Yuval" , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] RDMA/qedr: fix build error without ipv6 Date: Tue, 5 Sep 2017 16:59:20 +0200 Message-Id: <20170905145935.1578698-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:AiKro75VoeZkZzS0OZaGxTH1NWv6DphF5rDBd0XvZrpe7fjwjoI NqMDQ0hOGGJKovIhrM4NXEpG43fUVFobx8hXGm7CO0++IYniqgJsuAoB5Bme3CH9jYodqZC qFJvE3Y9nnNT+1NNxxuEHaacXpTpoDnYN0IkgGg08Gip42Yz9NaGG9PrTGDRSRxSX6YX4d9 QRKFqUtJrloTofVqUmmxQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:xeu6cQfjTU0=:Yon4JeA4S3mVFczDaZjT0y Ag0uSrYqusbXjmQ0W2q+eQQU0sgCQHKRkuqrJRuvNtDBYgRF+w0svJii9yntfkHJsv5izVq0T 9axKeLyUS0NVCyIBkG7c4JDphatjxI8YGhnaUYZWACGEpHJNxho3i5I+qULY3GNRyHspQaeUf iEIFvaUXNhAF2GlzRmEscEktV9LCYlOdq0rBFmXI6HbBNglVLgg9TiMh6lmfZoP6iDi01jDdf yt8X3BpDzGIShOBHyLm2Yp/iN/DM1VHcRqPEzpK+9vSsq4DctEWPTh4kAWoHMqu2d/7W8hYbl GNNoKRnbG7i58HjvXGCzve3ix8wO4IvlWR+6nzLQ9QGMXXIYSYJ1D4z1wowea1lJEstqrtvCi JO9+H9l2JLqubwIxhks6KmUlsVUQttzB2FjOxjpJFy17hUiUA7gWwbYx8OghTiAnPiSdv2Lqw qM/SoC2ymrTpUHUEA9KHS/ZaW9o0Ncp2TROMNnhTCR76uCtD03y9dlMgb9P2WWLJfpla/nhIZ QxlzYodnFl9lu748dSfh+fsKw3DKrY5DyrVugguvJKwQpmyPVe0BgGDRQrKYuxJSiCfNFImLl +6DbUNz9h/hR4mU5hj0AtZoBNhsDWxUh0FG8G4IcHgCxEq8vRBAhcYKcEqd+cTo8kiUdKiXBN DFXa02Suw9gQ/yNmiJbQKsIn4CY9EeuN3Sy4FBoLP4K/F4eGHmjjtBFUfRnwGueJzbLAIW7gE RkN7tQNPbOTj+DvrFU4WZM7ogD6E1xCzmab5yQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CONFIG_IPV6 disabled, we run into a link error: drivers/infiniband/hw/qedr/qedr_iw_cm.o: In function `qedr_addr6_resolve.isra.3': qedr_iw_cm.c:(.text+0x4e0): undefined reference to `ip6_route_output_flags' The ipv6 handling code is obviously not needed here, so this adds a compile-time check for the Kconfig symbol in all three places in the code that decide between ipv4 and ipv6. We don't have to worry about a link error wtih QEDR=y/IPV6=m, as that configuration is already prohibited by CONFIG_INFINIBAND depending on "m || IPV6 != m". Fixes: e411e0587e0d ("RDMA/qedr: Add iWARP connection management functions") Signed-off-by: Arnd Bergmann --- drivers/infiniband/hw/qedr/qedr_iw_cm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.9.0 Acked-by: Michal Kalderon diff --git a/drivers/infiniband/hw/qedr/qedr_iw_cm.c b/drivers/infiniband/hw/qedr/qedr_iw_cm.c index fe9b2b6149b0..2950d3f6ecb8 100644 --- a/drivers/infiniband/hw/qedr/qedr_iw_cm.c +++ b/drivers/infiniband/hw/qedr/qedr_iw_cm.c @@ -98,7 +98,8 @@ qedr_iw_mpa_request(void *context, struct qed_iwarp_cm_event_params *params) event.event = IW_CM_EVENT_CONNECT_REQUEST; event.status = params->status; - if (params->cm_info->ip_version == QED_TCP_IPV4) + if (!IS_ENABLED(CONFIG_IPV6) || + params->cm_info->ip_version == QED_TCP_IPV4) qedr_fill_sockaddr4(params->cm_info, &event); else qedr_fill_sockaddr6(params->cm_info, &event); @@ -522,7 +523,8 @@ int qedr_iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) memset(cm_info->local_ip, 0, sizeof(cm_info->local_ip)); memset(cm_info->remote_ip, 0, sizeof(cm_info->remote_ip)); - if (cm_id->remote_addr.ss_family == AF_INET) { + if (!IS_ENABLED(CONFIG_IPV6) || + cm_id->remote_addr.ss_family == AF_INET) { cm_info->ip_version = QED_TCP_IPV4; cm_info->remote_ip[0] = ntohl(raddr->sin_addr.s_addr); @@ -616,7 +618,8 @@ int qedr_iw_create_listen(struct iw_cm_id *cm_id, int backlog) iparams.event_cb = qedr_iw_event_handler; iparams.max_backlog = backlog; - if (cm_id->local_addr.ss_family == AF_INET) { + if (!IS_ENABLED(CONFIG_IPV6) || + cm_id->local_addr.ss_family == AF_INET) { iparams.ip_version = QED_TCP_IPV4; memset(iparams.ip_addr, 0, sizeof(iparams.ip_addr));