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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38667C433FE for ; Fri, 25 Feb 2022 14:55:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241963AbiBYOzr (ORCPT ); Fri, 25 Feb 2022 09:55:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241931AbiBYOzQ (ORCPT ); Fri, 25 Feb 2022 09:55:16 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3E10227590 for ; Fri, 25 Feb 2022 06:54:43 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id s13so4910353wrb.6 for ; Fri, 25 Feb 2022 06:54:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=google; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=44cheDsrMga6CJGQS6m14qlfeLe3FI23Gc2e1X2Hnzw=; b=ULc+qJe6of+28mEs4uQ5Si1ijlbI4KSNbJM4SF9Dnz+LNraH0mkAi8js2d9DoyCNnj ADJiFtrnCLzqHLgN2AzGGx92vZDJhPC5M8r9g3a961kF6xix5jW9/pdU6R49pfGSrErO S9ND4AQ6gPb6mCFvGY6sh1Vq6NRVurdqUDKWlSZNbYm/ktE7Ej5JcjYUqr41e358dfPX o3x+PQB1h8z8cE98zVeH8SrHgeW39y4nNZM8wqxIOlUZVFqtchXNS5rZw8xMFjhaYu9+ boukvzU3qVmI0Wws6V9sAFgyj3Vg0CXP6fbIw2B/Z+dXRADTo1D24EO9qyfnw1crlfro TIJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=44cheDsrMga6CJGQS6m14qlfeLe3FI23Gc2e1X2Hnzw=; b=vb7HBc+YpMjkk1OCsjBtTOP4FROnKJbdlXYCsF7blPuBh9Ikev2YA2qsVwhoyUobUn aeS89pUQmomTefI7pV4Kq2TNKu/YxTvUXHwuxaPCTT1pF+NMtcE3hPtqvSa32kiN/Eo0 8pLOLMKNSaWdUUE7nE5fM0ZFFaIZpuxXhJFEbFflw8LiC3RNtNxWiOTPoy0zzRaAeka2 2kR12NyC5Uoub09t9HXM8M92qmsUMvefwU4baoUj+5hrVp4tn/x49zzOXdITmmiXV0PG IL/AlFW1yCBizkfOm33q6sIXSgPuUoc1UVi3AfPEy74MPKP5R7yh3ampPg4cNreSFe9y HNzQ== X-Gm-Message-State: AOAM533ARKAK3/2R9nnvaV9L5kUyijBH5dpBezEHMvMhynxykPbfmRg7 YTLKWsBCcVd9SBxYCC1xu35sRw== X-Google-Smtp-Source: ABdhPJw6a856m+LbIbS/RKp6gkNtWXemojFqR++1UDO79dvu/R8BZozv2xax2MyEvHDMynnyx3XkxA== X-Received: by 2002:a5d:64e7:0:b0:1e4:bb8b:d3eb with SMTP id g7-20020a5d64e7000000b001e4bb8bd3ebmr6343325wri.403.1645800882473; Fri, 25 Feb 2022 06:54:42 -0800 (PST) Received: from ?IPV6:2a02:8084:e84:2480:228:f8ff:fe6f:83a8? ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id 11-20020a05600c26cb00b0037ff53511f2sm5681464wmv.31.2022.02.25.06.54.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Feb 2022 06:54:42 -0800 (PST) Message-ID: <7c7c0736-710d-192f-9688-d20dfa48d134@arista.com> Date: Fri, 25 Feb 2022 14:54:40 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH net-next] net/ip6mr: Fix build with !CONFIG_IPV6_PIMSM_V2 Content-Language: en-US To: David Ahern , linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Mobashshera Rasool , "David S. Miller" , Hideaki YOSHIFUJI , Jakub Kicinski , netdev@vger.kernel.org References: <20220223121721.421247-1-dima@arista.com> From: Dmitry Safonov In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2/25/22 03:00, David Ahern wrote: > On 2/23/22 5:17 AM, Dmitry Safonov wrote: >> 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 > > you could do one better and move it under the > 'if (v != mrt->mroute_do_pim) {' > > so that the do_wrmifwhole check is only done when needed I've tried to keep it simple and just to fix the build as I don't know which tests to run. Anyway, I sent v2: https://lore.kernel.org/all/20220225145206.561409-1-dima@arista.com/T/#u Is it what you meant? Thanks, Dmitry