Commit b34fc158 authored by David S. Miller's avatar David S. Miller

Merge branch 'net-skbuff-includes'

Jakub Kicinski says:

====================
net: skbuff: clean up unnecessary includes

skbuff.h is included in a significant portion of the tree.
Clean up unused dependencies to speed up builds.

This set only takes care of the most obvious cases.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6e65bb52 21bf7315
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#define __ASM_ARM_CHECKSUM_H #define __ASM_ARM_CHECKSUM_H
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/uaccess.h>
/* /*
* computes the checksum of a memory block at buff, length len, * computes the checksum of a memory block at buff, length len,
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
*/ */
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/uaccess.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
/** /**
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
/* Copyright (c) 2018-2019 Hisilicon Limited. */ /* Copyright (c) 2018-2019 Hisilicon Limited. */
#include <linux/device.h> #include <linux/device.h>
#include <linux/sched/clock.h>
#include "hclge_debugfs.h" #include "hclge_debugfs.h"
#include "hclge_err.h" #include "hclge_err.h"
......
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* Copyright (c) 2016-2017 Hisilicon Limited. */ /* Copyright (c) 2016-2017 Hisilicon Limited. */
#include <linux/sched/clock.h>
#include "hclge_err.h" #include "hclge_err.h"
static const struct hclge_hw_error hclge_imp_tcm_ecc_int[] = { static const struct hclge_hw_error hclge_imp_tcm_ecc_int[] = {
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
* under either the MPL or the GPL. * under either the MPL or the GPL.
*/ */
#include <linux/net.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/delay.h> #include <linux/delay.h>
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/sched/clock.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/aer.h> #include <linux/aer.h>
#include <linux/slab.h> #include <linux/slab.h>
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/printk.h> #include <linux/printk.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/sched/clock.h>
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/set_memory.h> #include <linux/set_memory.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/in.h> #include <linux/in.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/refcount.h> #include <linux/refcount.h>
#include <linux/sockptr.h>
#include <uapi/linux/igmp.h> #include <uapi/linux/igmp.h>
static inline struct igmphdr *igmp_hdr(const struct sk_buff *skb) static inline struct igmphdr *igmp_hdr(const struct sk_buff *skb)
......
...@@ -23,17 +23,11 @@ ...@@ -23,17 +23,11 @@
#include <linux/atomic.h> #include <linux/atomic.h>
#include <asm/types.h> #include <asm/types.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/net.h>
#include <linux/textsearch.h>
#include <net/checksum.h> #include <net/checksum.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/hrtimer.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/netdev_features.h> #include <linux/netdev_features.h>
#include <linux/sched.h>
#include <linux/sched/clock.h>
#include <net/flow_dissector.h> #include <net/flow_dissector.h>
#include <linux/splice.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/if_packet.h> #include <linux/if_packet.h>
#include <linux/llist.h> #include <linux/llist.h>
...@@ -280,6 +274,7 @@ struct napi_struct; ...@@ -280,6 +274,7 @@ struct napi_struct;
struct bpf_prog; struct bpf_prog;
union bpf_attr; union bpf_attr;
struct skb_ext; struct skb_ext;
struct ts_config;
#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
struct nf_bridge_info { struct nf_bridge_info {
......
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <asm/types.h> #include <asm/types.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/uaccess.h>
#include <asm/checksum.h> #include <asm/checksum.h>
#if !defined(_HAVE_ARCH_COPY_AND_CSUM_FROM_USER) || !defined(HAVE_CSUM_COPY_USER)
#include <linux/uaccess.h>
#endif
#ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER #ifndef _HAVE_ARCH_COPY_AND_CSUM_FROM_USER
static __always_inline static __always_inline
......
...@@ -8,12 +8,13 @@ ...@@ -8,12 +8,13 @@
#ifndef _NET_FLOW_H #ifndef _NET_FLOW_H
#define _NET_FLOW_H #define _NET_FLOW_H
#include <linux/socket.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <net/flow_dissector.h> #include <linux/container_of.h>
#include <linux/uidgid.h> #include <linux/uidgid.h>
struct flow_keys;
/* /*
* ifindex generation is per-net namespace, and loopback is * ifindex generation is per-net namespace, and loopback is
* always the 1st device in ns (see net_dev_init), thus any * always the 1st device in ns (see net_dev_init), thus any
......
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
#include <linux/capability.h> #include <linux/capability.h>
#include <linux/user_namespace.h> #include <linux/user_namespace.h>
#include <linux/indirect_call_wrapper.h> #include <linux/indirect_call_wrapper.h>
#include <linux/textsearch.h>
#include "dev.h" #include "dev.h"
#include "sock_destructor.h" #include "sock_destructor.h"
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
* *
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sched/clock.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <net/sock.h> #include <net/sock.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/sched/clock.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/rds.h> #include <linux/rds.h>
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/rcupdate_wait.h> #include <linux/rcupdate_wait.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/splice.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/tcp.h> #include <net/tcp.h>
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <linux/net.h> #include <linux/net.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/sched/signal.h> #include <linux/sched/signal.h>
#include <linux/splice.h>
#include <net/sock.h> #include <net/sock.h>
#include <trace/events/sock.h> #include <trace/events/sock.h>
......
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
#include <linux/mount.h> #include <linux/mount.h>
#include <net/checksum.h> #include <net/checksum.h>
#include <linux/security.h> #include <linux/security.h>
#include <linux/splice.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/file.h> #include <linux/file.h>
#include <linux/btf_ids.h> #include <linux/btf_ids.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment