X-Received: by 2002:a05:6a00:23d5:b0:4e1:7cfb:7e85 with SMTP id g21-20020a056a0023d500b004e17cfb7e85mr203619pfc.29.1645630495352; Wed, 23 Feb 2022 07:34:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645630495; cv=none; d=google.com; s=arc-20160816; b=Ma1sbHiFYUlNJHXwq639FNLic70vAzV/yBq3VlBUAEMMe8VFV48f0jFS/hCGOF9dNP 1EqaZkJ2O1v+UQvjTNZO4qozldaSLAVWxGXOe0T2wU6nRnU1ruKh0pIVBykCSJwk4JzF KvAGAP8gG8bnXh+FFSEarNQagr8Aas32KuwIp9Ehw6UuE7epjyGFDu1EmXOiA6d2reQE DMeDMC6rjUFXGu573rr3XOJnk/IlC+oMf3KY4Sj7PmMtsFBLOVSCr+hMAJRmlUaaR9Pb gCC+2LfFAj5CE1kqdmtHIBfM4qL6cvO4MRzhMb6exYdr0pknMsi28AiDkLqFklnuoepX 0DEA== 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=3EvTLjCE04FQaQLZNcKs5KtscjgLIzQ7nMdfZDgRHBM=; b=SknU/7INDdFDBGpCrv917xJUpHyhK0DvwFIHl0cMAAcw+ly9Hx0lNd27MyVY7JVipE zJrZQwLAz88i906f4+8qZo+G0OnsUywZ7xR+Yn53PL9jBlpFjGQkpd/WwoMQLfPYhoC2 RZH9xeZ4HGmDpN3YfO6gW9oy6qHA5gIRBQyarywqZcYrPPAxV7hJGNzwgk2jd7zoc+Uy 7PfKrD3na8LQMhPM7f0Q/sEojHv8/v8Ir511sKwOSjg/D3p5bjBABjFYQ6QFL73SVZxI sZE3D2TWIIHQEXdpt44BSiAfjZEE25OaQeER6MfVPm/1xOyQfOv+NG6wRMXfpOYQ8wim inPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@arista.com header.s=google header.b=eTr+NNbH; 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=REJECT sp=REJECT dis=NONE) header.from=arista.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w19-20020a17090a461300b001bca39c52c8si1160591pjg.15.2022.02.23.07.34.39; Wed, 23 Feb 2022 07:34:55 -0800 (PST) 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=@arista.com header.s=google header.b=eTr+NNbH; 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=REJECT sp=REJECT dis=NONE) header.from=arista.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240383AbiBWMSE (ORCPT + 99 others); Wed, 23 Feb 2022 07:18:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240385AbiBWMRw (ORCPT ); Wed, 23 Feb 2022 07:17:52 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21A47522EA for ; Wed, 23 Feb 2022 04:17:24 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id s13so10758498wrb.6 for ; Wed, 23 Feb 2022 04:17:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3EvTLjCE04FQaQLZNcKs5KtscjgLIzQ7nMdfZDgRHBM=; b=eTr+NNbH39z8mQh66PwnzEUUT5N8bFmssFPlh6IO8x8ZybrDQBfgFTqUfuKABanS9M kTWBq8Itgk+MnG0UgtkwMgtYyaI4O4pAwj/g7nujwzoxOxTaKtFrVAdMeWMBcrKYld69 uSbvfBKa2zZo8RjwkJ2kvy9zGtH3KE6sM8Qs4E2vnTmGDOmiQvWBU1fCSkpm9XLoiRUE rUT0i7z3Hi09hjlC84hMb2dkQ0a1I0l6CkHDruUdjeGddOeIAd7ucNd2uBvKC/rPEILv 3OAZgNUr9UwwDTN+aEhWejdGhSb1uP61BtAUgq/FXQh9puAvE8XK8e1NxXT9mRGVD9s/ RSHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3EvTLjCE04FQaQLZNcKs5KtscjgLIzQ7nMdfZDgRHBM=; b=375srrEQAwwWhNS4SS3VARWm9SFy4gS175Ub4emDMDuGNI3pgLs/RI8BTbXAxSNN9t g71HWq5pB47Z80c62gvn5Ez0Qe537i+9E835lpZXdTqDLKPKWCcnG3oDy/iNukzS0B5X 8MiSRu9dAO+5IffrDYRUNOr32ORikJxw2kQlHR9qPHMdTQ9OY0C6WGDhYIjt+BDrkeC4 ff4cOfRuF3280VU7Yc4rQiLMtk0fw6+f/14xhpedQYM4UR80SMMXU8b+MTqovWkrEdBY wVm2URFX/FPE7w6mLg+zndndAir21DM9y/Ocp8kRuCEcsGz5hHq4xLzHjm4msWtRYaLX 8nSQ== X-Gm-Message-State: AOAM531sOcz2I15yT5MHtGg8fwCd4pWXkMPN0UyM5Zr3eAj6VBZp2gW+ GqY/qX26lQA88IT7flCNxuEKp9TO4diCsw== X-Received: by 2002:a05:6000:1863:b0:1ed:9e8a:9413 with SMTP id d3-20020a056000186300b001ed9e8a9413mr3605301wri.282.1645618642470; Wed, 23 Feb 2022 04:17:22 -0800 (PST) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id l12sm54230867wrs.11.2022.02.23.04.17.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 04:17:22 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Mobashshera Rasool , "David S. Miller" , Hideaki YOSHIFUJI , David Ahern , Jakub Kicinski , netdev@vger.kernel.org Subject: [PATCH net-next] net/ip6mr: Fix build with !CONFIG_IPV6_PIMSM_V2 Date: Wed, 23 Feb 2022 12:17:21 +0000 Message-Id: <20220223121721.421247-1-dima@arista.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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_NONE, SPF_HELO_NONE,SPF_NONE,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 The following build-error on my config: net/ipv6/ip6mr.c: In function ‘ip6_mroute_setsockopt’: net/ipv6/ip6mr.c:1656:14: error: unused variable ‘do_wrmifwhole’ [-Werror=unused-variable] 1656 | bool do_wrmifwhole; | ^ Cc: Mobashshera Rasool Cc: David S. Miller Cc: Hideaki YOSHIFUJI Cc: David Ahern Cc: Jakub Kicinski Cc: netdev@vger.kernel.org Fixes: 4b340a5a726d Signed-off-by: Dmitry Safonov --- net/ipv6/ip6mr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index a9775c830194..4e74bc61a3db 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1653,7 +1653,6 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval, mifi_t mifi; struct net *net = sock_net(sk); struct mr_table *mrt; - bool do_wrmifwhole; if (sk->sk_type != SOCK_RAW || inet_sk(sk)->inet_num != IPPROTO_ICMPV6) @@ -1761,6 +1760,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, sockptr_t optval, #ifdef CONFIG_IPV6_PIMSM_V2 case MRT6_PIM: { + bool do_wrmifwhole; int v; if (optlen != sizeof(v)) base-commit: 922ea87ff6f2b63f413c6afa2c25b287dce76639 -- 2.35.1