Commit 85cfbc25 authored by Jeremy Sowden's avatar Jeremy Sowden Committed by Pablo Neira Ayuso
Browse files

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.

Signed-off-by: default avatarJeremy Sowden <jeremy@azazel.net>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent f5d65c19

include/linux/netfilter/xt_hashlimit.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _XT_HASHLIMIT_H

#define _XT_HASHLIMIT_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)

#endif /*_XT_HASHLIMIT_H*/

include/linux/netfilter/xt_physdev.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _XT_PHYSDEV_H

#define _XT_PHYSDEV_H



#include <linux/if.h>

#include <uapi/linux/netfilter/xt_physdev.h>



#endif /*_XT_PHYSDEV_H*/

include/linux/netfilter_bridge/ebt_802_3.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __LINUX_BRIDGE_EBT_802_3_H

#define __LINUX_BRIDGE_EBT_802_3_H



#include <linux/skbuff.h>

#include <uapi/linux/netfilter_bridge/ebt_802_3.h>



static inline struct ebt_802_3_hdr *ebt_802_3_hdr(const struct sk_buff *skb)

{

	return (struct ebt_802_3_hdr *)skb_mac_header(skb);

}

#endif

net/bridge/netfilter/ebt_802_3.c

+7 −1
Original line number Diff line number Diff line
@@ -11,7 +11,13 @@ 
#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)

net/netfilter/xt_hashlimit.c

+6 −1
Original line number Diff line number Diff line
@@ -34,9 +34,14 @@ 
#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>");

CRA Git | Maintained and supported by SUSTech CRA and CCSE