netfilter: inline xt_hashlimit, ebt_802_3 and xt_physdev headers

Three netfilter headers are only included once. Inline their contents at those sites and remove them.

Jeremy Sowden committed 7 years ago

Commit 85cfbc21 parent f5d65c16 files · +16 −35Browse files

Unified · Split

6 files

include/linux/netfilter/xt_hashlimit.h +0 −11
include/linux/netfilter/xt_physdev.h +0 −8
include/linux/netfilter_bridge/ebt_802_3.h +0 −12
net/bridge/netfilter/ebt_802_3.c +7 −1
net/netfilter/xt_hashlimit.c +6 −1
net/netfilter/xt_physdev.c +3 −2

include/linux/netfilter/xt_hashlimit.h+0−11

@@ -1,11 +0,0 @@
1		−/* SPDX-License-Identifier: GPL-2.0 */
2		−#ifndef _XT_HASHLIMIT_H
3		−#define _XT_HASHLIMIT_H
4		−
5		−#include <uapi/linux/netfilter/xt_hashlimit.h>
6		−
7		−#define XT_HASHLIMIT_ALL (XT_HASHLIMIT_HASH_DIP \| XT_HASHLIMIT_HASH_DPT \| \
8		− XT_HASHLIMIT_HASH_SIP \| XT_HASHLIMIT_HASH_SPT \| \
9		− XT_HASHLIMIT_INVERT \| XT_HASHLIMIT_BYTES \|\
10		− XT_HASHLIMIT_RATE_MATCH)
11		−#endif /_XT_HASHLIMIT_H/

include/linux/netfilter/xt_physdev.h+0−8

@@ -1,8 +0,0 @@
1		−/* SPDX-License-Identifier: GPL-2.0 */
2		−#ifndef _XT_PHYSDEV_H
3		−#define _XT_PHYSDEV_H
4		−
5		−#include <linux/if.h>
6		−#include <uapi/linux/netfilter/xt_physdev.h>
7		−
8		−#endif /_XT_PHYSDEV_H/

include/linux/netfilter_bridge/ebt_802_3.h+0−12

@@ -1,12 +0,0 @@
1		−/* SPDX-License-Identifier: GPL-2.0 */
2		−#ifndef __LINUX_BRIDGE_EBT_802_3_H
3		−#define __LINUX_BRIDGE_EBT_802_3_H
4		−
5		−#include <linux/skbuff.h>
6		−#include <uapi/linux/netfilter_bridge/ebt_802_3.h>
7		−
8		−static inline struct ebt_802_3_hdr ebt_802_3_hdr(const struct sk_buff skb)
9		−{
10		− return (struct ebt_802_3_hdr *)skb_mac_header(skb);
11		−}
12		−#endif

net/bridge/netfilter/ebt_802_3.c+7−1

@@ -11,7 +11,13 @@ · 10 unmodified lines
11	11	#include <linux/module.h>
12	12	#include <linux/netfilter/x_tables.h>
13	13	#include <linux/netfilter_bridge/ebtables.h>
14		−#include <linux/netfilter_bridge/ebt_802_3.h>
	14	+#include <linux/skbuff.h>
	15	+#include <uapi/linux/netfilter_bridge/ebt_802_3.h>
	16	+
	17	+static struct ebt_802_3_hdr ebt_802_3_hdr(const struct sk_buff skb)
	18	+{
	19	+ return (struct ebt_802_3_hdr *)skb_mac_header(skb);
	20	+}
15	21
16	22	static bool
17	23	ebt_802_3_mt(const struct sk_buff skb, struct xt_action_param par)

net/netfilter/xt_hashlimit.c+6−1

@@ -34,9 +34,14 @@ · 33 unmodified lines
34	34	#include <linux/netfilter/x_tables.h>
35	35	#include <linux/netfilter_ipv4/ip_tables.h>
36	36	#include <linux/netfilter_ipv6/ip6_tables.h>
37		−#include <linux/netfilter/xt_hashlimit.h>
38	37	#include <linux/mutex.h>
39	38	#include <linux/kernel.h>
	39	+#include <uapi/linux/netfilter/xt_hashlimit.h>
	40	+
	41	+#define XT_HASHLIMIT_ALL (XT_HASHLIMIT_HASH_DIP \| XT_HASHLIMIT_HASH_DPT \| \
	42	+ XT_HASHLIMIT_HASH_SIP \| XT_HASHLIMIT_HASH_SPT \| \
	43	+ XT_HASHLIMIT_INVERT \| XT_HASHLIMIT_BYTES \|\
	44	+ XT_HASHLIMIT_RATE_MATCH)
40	45
41	46	MODULE_LICENSE("GPL");
42	47	MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");

net/netfilter/xt_physdev.c+3−2

@@ -5,12 +5,13 @@ · 4 unmodified lines
5	5	/* (C) 2001-2003 Bart De Schuymer <bdschuym@pandora.be>
6	6	*/
7	7	#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
	8	+
	9	+#include <linux/if.h>
8	10	#include <linux/module.h>
9	11	#include <linux/skbuff.h>
10	12	#include <linux/netfilter_bridge.h>
11		−#include <linux/netfilter/xt_physdev.h>
12	13	#include <linux/netfilter/x_tables.h>
13		−#include <net/netfilter/br_netfilter.h>
	14	+#include <uapi/linux/netfilter/xt_physdev.h>
14	15
15	16	MODULE_LICENSE("GPL");
16	17	MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");