From patchwork Sun Jun 19 23:34:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12886877 X-Patchwork-Delegate: kuba@kernel.org 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 AA00FC433EF for ; Sun, 19 Jun 2022 23:34:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234969AbiFSXeh (ORCPT ); Sun, 19 Jun 2022 19:34:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231539AbiFSXeh (ORCPT ); Sun, 19 Jun 2022 19:34:37 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30B1165B9; Sun, 19 Jun 2022 16:34:32 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4LR8J25MDpz4xD3; Mon, 20 Jun 2022 09:34:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1655681667; bh=XCmoHAJGKCFrPOl+19AKGJEOmMMNLQ7mtdF3GYoctpc=; h=Date:From:To:Cc:Subject:From; b=LrAXmYNMKJQFE6xc/ROjRyS2fEKsVGVfQn1Ww90Fj9MoDIq9bqjbYJOkfNY2xounT wqiQySykp675Y66viCFq7OgjRUCVhTcqUAKCdwxXfQSaSFUO6a4jRPSI18pFpxg9SP 6dMfJObonep3pQo+RBb09NYg+EC7GEhamdKTszRm4FgEhYTEkbjNffB6YiUcxdDAp2 gq/9J88gm3osvH7HLSC6Us5hsOw08QEXfP6WOsxV3G/w5bbJfErrtkoSArVGmiHbIh QLUue1cTwZEut61Q78nF8av9Cs4kleGh4dLRWZFH/c/2W3MariC22yN3oNKyOB+2Aw AL6LpOEFrJa9w== Date: Mon, 20 Jun 2022 09:34:24 +1000 From: Stephen Rothwell To: David Miller Cc: Networking , Eric Dumazet , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the net-next tree Message-ID: <20220620093424.0615a374@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Hi all, After merging the net-next tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: net/ipv4/raw.c: In function 'raw_icmp_error': net/ipv4/raw.c:266:9: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 266 | struct hlist_nulls_head *hlist; | ^~~~~~ cc1: all warnings being treated as errors Introduced by commit ba44f8182ec2 ("raw: use more conventional iterators") I have applied the following patch for today. From: Stephen Rothwell Date: Mon, 20 Jun 2022 09:21:01 +1000 Subject: [PATCH] raw: fix build error The linux-next x86_64 allmodconfig build produced this error: net/ipv4/raw.c: In function 'raw_icmp_error': net/ipv4/raw.c:266:9: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] 266 | struct hlist_nulls_head *hlist; | ^~~~~~ cc1: all warnings being treated as errors Fixes: ba44f8182ec2 ("raw: use more conventional iterators") Signed-off-by: Stephen Rothwell --- net/ipv4/raw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index d28bf0b901a2..b3b255db9021 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -262,7 +262,7 @@ static void raw_err(struct sock *sk, struct sk_buff *skb, u32 info) void raw_icmp_error(struct sk_buff *skb, int protocol, u32 info) { - struct net *net = dev_net(skb->dev);; + struct net *net = dev_net(skb->dev); struct hlist_nulls_head *hlist; struct hlist_nulls_node *hnode; int dif = skb->dev->ifindex;