[NETFILTER]: x_tables: remove unused argument to target functions (fe1cb108) · Commits · 戴 / test

include/linux/netfilter/x_tables.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -211,8 +211,7 @@ struct xt_target
		const struct net_device *out,
		unsigned int hooknum,
		const struct xt_target *target,
		const void *targinfo,
		void *userdata);
		const void *targinfo);

		/* Called when user tries to insert an entry of this type:
		hook_mask is a bitmask of hooks from which it can be

+1 −2

Original line number	Diff line number	Diff line
		@@ -248,8 +248,7 @@ extern unsigned int arpt_do_table(struct sk_buff **pskb,
		unsigned int hook,
		const struct net_device *in,
		const struct net_device *out,
		struct arpt_table *table,
		void *userdata);
		struct arpt_table *table);

		#define ARPT_ALIGN(s) (((s) + (__alignof__(struct arpt_entry)-1)) & ~(__alignof__(struct arpt_entry)-1))
		#endif /__KERNEL__/

+1 −2

Original line number	Diff line number	Diff line
		@@ -312,8 +312,7 @@ extern unsigned int ipt_do_table(struct sk_buff **pskb,
		unsigned int hook,
		const struct net_device *in,
		const struct net_device *out,
		struct ipt_table *table,
		void *userdata);
		struct ipt_table *table);

		#define IPT_ALIGN(s) XT_ALIGN(s)

+1 −2

Original line number	Diff line number	Diff line
		@@ -300,8 +300,7 @@ extern unsigned int ip6t_do_table(struct sk_buff **pskb,
		unsigned int hook,
		const struct net_device *in,
		const struct net_device *out,
		struct ip6t_table *table,
		void *userdata);
		struct ip6t_table *table);

		/* Check for an extension */
		extern int ip6t_ext_hdr(u8 nexthdr);

+3 −6

Original line number	Diff line number	Diff line
		@@ -208,8 +208,7 @@ static unsigned int arpt_error(struct sk_buff **pskb,
		const struct net_device *out,
		unsigned int hooknum,
		const struct xt_target *target,
		const void *targinfo,
		void *userinfo)
		const void *targinfo)
		{
		if (net_ratelimit())
		printk("arp_tables: error: '%s'\n", (char *)targinfo);
		@@ -226,8 +225,7 @@ unsigned int arpt_do_table(struct sk_buff **pskb,
		unsigned int hook,
		const struct net_device *in,
		const struct net_device *out,
		struct arpt_table *table,
		void *userdata)
		struct arpt_table *table)
		{
		static const char nulldevname[IFNAMSIZ];
		unsigned int verdict = NF_DROP;
		@@ -302,8 +300,7 @@ unsigned int arpt_do_table(struct sk_buff **pskb,
		in, out,
		hook,
		t->u.kernel.target,
		t->data,
		userdata);
		t->data);

		/* Target might have changed stuff. */
		arp = (*pskb)->nh.arph;