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

@@ -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/

@@ -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/

@@ -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

 #include <linux/module.h>
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_bridge/ebtables.h>
-#include <linux/netfilter_bridge/ebt_802_3.h>
+#include <linux/skbuff.h>
+#include <uapi/linux/netfilter_bridge/ebt_802_3.h>
+static struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb)
+{
+	return (struct ebt_802_3_hdr *)skb_mac_header(skb);
+}
 static bool
 ebt_802_3_mt(const struct sk_buff *skb, struct xt_action_param *par)

 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
-#include <linux/netfilter/xt_hashlimit.h>
 #include <linux/mutex.h>
 #include <linux/kernel.h>
+#include <uapi/linux/netfilter/xt_hashlimit.h>
+#define XT_HASHLIMIT_ALL (XT_HASHLIMIT_HASH_DIP | XT_HASHLIMIT_HASH_DPT | \
+			  XT_HASHLIMIT_HASH_SIP | XT_HASHLIMIT_HASH_SPT | \
+			  XT_HASHLIMIT_INVERT | XT_HASHLIMIT_BYTES |\
+			  XT_HASHLIMIT_RATE_MATCH)
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");

 /* (C) 2001-2003 Bart De Schuymer <bdschuym@pandora.be>
  */
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/if.h>
 #include <linux/module.h>
 #include <linux/skbuff.h>
 #include <linux/netfilter_bridge.h>
-#include <linux/netfilter/xt_physdev.h>
 #include <linux/netfilter/x_tables.h>
-#include <net/netfilter/br_netfilter.h>
+#include <uapi/linux/netfilter/xt_physdev.h>
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Bart De Schuymer <bdschuym@pandora.be>");

Keyboard shortcuts