2022-06-19 23:49:36

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: build failure after merge of the net-next tree

---

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 <[email protected]>
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 <[email protected]>
---
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;
--
2.35.1

--
Cheers,
Stephen Rothwell

---

Attachments:

(No filename) (499.00 B)
OpenPGP digital signature

2022-06-20 00:23:06

by Kuniyuki Iwashima

[permalink] [raw]

Subject: Re: linux-next: build failure after merge of the net-next tree

---

Date: Mon, 20 Jun 2022 09:34:24 +1000
From: Stephen Rothwell <[email protected]>
> 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.

I have posted the same patch just few minutes ago,
https://lore.kernel.org/netdev/[email protected]/


> From: Stephen Rothwell <[email protected]>
> 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 <[email protected]>
> ---
> 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;
> --
> 2.35.1
>
> --
> Cheers,
> Stephen Rothwell