linux-next: build failure in Linus' tree

[Stephen Rothwell]

Hi Linus,

After merging the origin tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/net/ethernet/mellanox/mlx4/en_rx.c:582:18: warning: 'struct iphdr' declared inside parameter list will not be visible outside of this definition or declaration
           struct iphdr *iph)
                  ^~~~~
drivers/net/ethernet/mellanox/mlx4/en_rx.c: In function 'get_fixed_ipv4_csum':
drivers/net/ethernet/mellanox/mlx4/en_rx.c:586:20: error: dereferencing pointer to incomplete type 'struct iphdr'
  __u8 ipproto = iph->protocol;
                    ^~

Caused by commit

  55469bc6b577 ("drivers: net: remove <net/busy_poll.h> inclusion when not needed")

I added the following patch:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 29 Oct 2018 09:40:39 +1100
Subject: [PATCH] drivers: net: include linux/ip.h for iphdr

Fixes: 55469bc6b577 ("drivers: net: remove <net/busy_poll.h> inclusion when not needed")
Cc: Eric Dumazet <edumazet@xxxxxxxxxx>
Cc: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/net/ethernet/mellanox/mlx4/en_rx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
index 5a6d0919533d..ffa54767dfe5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c
@@ -31,6 +31,7 @@
  *
  */
 
+#include <linux/ip.h>
 #include <linux/bpf.h>
 #include <linux/bpf_trace.h>
 #include <linux/mlx4/cq.h>
-- 
2.18.0

-- 
Cheers,
Stephen Rothwell

Attachment: pgpMoVmvvVXKz.pgp
Description: OpenPGP digital signature