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 E9E62C433FE for ; Thu, 10 Nov 2022 13:47:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231210AbiKJNrd (ORCPT ); Thu, 10 Nov 2022 08:47:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229586AbiKJNrZ (ORCPT ); Thu, 10 Nov 2022 08:47:25 -0500 Received: from vps0.lunn.ch (vps0.lunn.ch [156.67.10.101]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AB3761745; Thu, 10 Nov 2022 05:47:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lunn.ch; s=20171124; h=In-Reply-To:Content-Disposition:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:From:Sender:Reply-To:Subject: Date:Message-ID:To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Content-Disposition:In-Reply-To:References; bh=cBJxJE+HDCTGVW4nP1oD4Tm/AJ6zzyKfXe5KSUdkRHU=; b=b3JHN2a1QQU75g16Z74Sp/M/Yz UuqDodapwtpdTRz7TJnM3ZhX7omPmz5CDRs7zDKOPSoTIEzflGhG2RJpVCVGHQifiFhdogAJXY0nK j0IaCVtH8oqF8QIamwNYj/VtX8n9d+VacFYpzfao0O1A94ege3Vc/GShplMtBKes4KMo=; Received: from andrew by vps0.lunn.ch with local (Exim 4.94.2) (envelope-from ) id 1ot7tf-0022JC-2O; Thu, 10 Nov 2022 14:47:11 +0100 Date: Thu, 10 Nov 2022 14:47:11 +0100 From: Andrew Lunn To: David Howells Cc: netdev@vger.kernel.org, kernel test robot , Marc Dionne , linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next] rxrpc: Fix missing IPV6 #ifdef Message-ID: References: <166807341463.2904467.10141806642379634063.stgit@warthog.procyon.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <166807341463.2904467.10141806642379634063.stgit@warthog.procyon.org.uk> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 10, 2022 at 09:43:34AM +0000, David Howells wrote: > Fix rxrpc_encap_err_rcv() to make the call to ipv6_icmp_error conditional > on IPV6 support being enabled. > > Fixes: b6c66c4324e7 ("rxrpc: Use the core ICMP/ICMP6 parsers") > Reported-by: kernel test robot > Signed-off-by: David Howells > cc: Marc Dionne > cc: linux-afs@lists.infradead.org > cc: netdev@vger.kernel.org > --- > > net/rxrpc/local_object.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c > index a178f71e5082..25cdfcf7b415 100644 > --- a/net/rxrpc/local_object.c > +++ b/net/rxrpc/local_object.c > @@ -33,7 +33,9 @@ static void rxrpc_encap_err_rcv(struct sock *sk, struct sk_buff *skb, int err, > { > if (ip_hdr(skb)->version == IPVERSION) > return ip_icmp_error(sk, skb, err, port, info, payload); > +#ifdef CONFIG_AF_RXRPC_IPV6 > return ipv6_icmp_error(sk, skb, err, port, info, payload); > +#endif Can this be if (IS_ENABLED(CONFIG_AF_RXRPC_IPV6) {} rather than #ifdef? It gives better build testing. Andrew