net: Add includes masked by netdevice.h including uapi/bpf.h

Add missing includes unmasked by the subsequent change. Mostly network drivers missing an include for XDP_PACKET_HEADROOM.

Jakub Kicinski committed 4 years ago

Commit 3b80b731 parent 1705c627 files · +9 −0Browse files

Unified · Split

7 files

drivers/net/ethernet/amazon/ena/ena_netdev.h +1 −0
drivers/net/ethernet/cavium/thunder/nicvf_queues.c +1 −0
drivers/net/ethernet/microsoft/mana/mana_en.c +2 −0
drivers/net/ethernet/stmicro/stmmac/stmmac.h +1 −0
drivers/net/ethernet/ti/cpsw_priv.h +2 −0
include/net/ip6_fib.h +1 −0
kernel/bpf/net_namespace.c +1 −0

drivers/net/ethernet/amazon/ena/ena_netdev.h+1−0

@@ -14,6 +14,7 @@ · 13 unmodified lines
14	#include <linux/interrupt.h>	14	#include <linux/interrupt.h>
15	#include <linux/netdevice.h>	15	#include <linux/netdevice.h>
16	#include <linux/skbuff.h>	16	#include <linux/skbuff.h>
		17	#include <uapi/linux/bpf.h>
17		18
18	#include "ena_com.h"	19	#include "ena_com.h"
19	#include "ena_eth_com.h"	20	#include "ena_eth_com.h"

drivers/net/ethernet/cavium/thunder/nicvf_queues.c+1−0

@@ -10,6 +10,7 @@ · 9 unmodified lines
10	#include <linux/iommu.h>	10	#include <linux/iommu.h>
11	#include <net/ip.h>	11	#include <net/ip.h>
12	#include <net/tso.h>	12	#include <net/tso.h>
		13	#include <uapi/linux/bpf.h>
13		14
14	#include "nic_reg.h"	15	#include "nic_reg.h"
15	#include "nic.h"	16	#include "nic.h"

drivers/net/ethernet/microsoft/mana/mana_en.c+2−0

@@ -1,6 +1,8 @@
1	// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause	1	// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
2	/* Copyright (c) 2021, Microsoft Corporation. */	2	/* Copyright (c) 2021, Microsoft Corporation. */
3		3
		4	#include <uapi/linux/bpf.h>
		5
4	#include <linux/inetdevice.h>	6	#include <linux/inetdevice.h>
5	#include <linux/etherdevice.h>	7	#include <linux/etherdevice.h>
6	#include <linux/ethtool.h>	8	#include <linux/ethtool.h>

drivers/net/ethernet/stmicro/stmmac/stmmac.h+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22	#include <linux/net_tstamp.h>	22	#include <linux/net_tstamp.h>
23	#include <linux/reset.h>	23	#include <linux/reset.h>
24	#include <net/page_pool.h>	24	#include <net/page_pool.h>
		25	#include <uapi/linux/bpf.h>
25		26
26	struct stmmac_resources {	27	struct stmmac_resources {
27	void __iomem *addr;	28	void __iomem *addr;

drivers/net/ethernet/ti/cpsw_priv.h+2−0

@@ -6,6 +6,8 @@ · 5 unmodified lines
6	#ifndef DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_	6	#ifndef DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_
7	#define DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_	7	#define DRIVERS_NET_ETHERNET_TI_CPSW_PRIV_H_
8		8
		9	#include <uapi/linux/bpf.h>
		10
9	#include "davinci_cpdma.h"	11	#include "davinci_cpdma.h"
10		12
11	#define CPSW_DEBUG (NETIF_MSG_HW \| NETIF_MSG_WOL \| \	13	#define CPSW_DEBUG (NETIF_MSG_HW \| NETIF_MSG_WOL \| \

include/net/ip6_fib.h+1−0

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	#include <net/inetpeer.h>	20	#include <net/inetpeer.h>
21	#include <net/fib_notifier.h>	21	#include <net/fib_notifier.h>
22	#include <linux/indirect_call_wrapper.h>	22	#include <linux/indirect_call_wrapper.h>
		23	#include <uapi/linux/bpf.h>
23		24
24	#ifdef CONFIG_IPV6_MULTIPLE_TABLES	25	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
25	#define FIB6_TABLE_HASHSZ 256	26	#define FIB6_TABLE_HASHSZ 256

kernel/bpf/net_namespace.c+1−0

@@ -1,6 +1,7 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0
2		2
3	#include <linux/bpf.h>	3	#include <linux/bpf.h>
		4	#include <linux/bpf-netns.h>
4	#include <linux/filter.h>	5	#include <linux/filter.h>
5	#include <net/net_namespace.h>	6	#include <net/net_namespace.h>
6		7