Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba7a98a authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of git://dev.medozas.de/linux

parents d250fe91 4538506b

include/linux/netfilter/x_tables.h

+19 −26
Original line number Diff line number Diff line
@@ -183,29 +183,39 @@ struct xt_counters_info { 
#include <linux/netdevice.h>



/**

 * struct xt_match_param - parameters for match extensions' match functions

 * struct xt_action_param - parameters for matches/targets

 *

 * @match:	the match extension

 * @target:	the target extension

 * @matchinfo:	per-match data

 * @targetinfo:	per-target data

 * @in:		input netdevice

 * @out:	output netdevice

 * @match:	struct xt_match through which this function was invoked

 * @matchinfo:	per-match data

 * @fragoff:	packet is a fragment, this is the data offset

 * @thoff:	position of transport header relative to skb->data

 * @hook:	hook number given packet came from

 * @family:	Actual NFPROTO_* through which the function is invoked

 * 		(helpful when match->family == NFPROTO_UNSPEC)

 *

 * Fields written to by extensions:

 *

 * @hotdrop:	drop packet if we had inspection problems

 * Network namespace obtainable using dev_net(in/out)

 */

struct xt_match_param {

	const struct net_device *in, *out;

struct xt_action_param {

	union {

		const struct xt_match *match;

	const void *matchinfo;

		const struct xt_target *target;

	};

	union {

		const void *matchinfo, *targinfo;

	};

	const struct net_device *in, *out;

	int fragoff;

	unsigned int thoff;

	unsigned int hooknum;

	u_int8_t family;

	bool *hotdrop;

	bool hotdrop;

};



/**
@@ -242,23 +252,6 @@ struct xt_mtdtor_param { 
	u_int8_t family;

};



/**

 * struct xt_target_param - parameters for target extensions' target functions

 *

 * @hooknum:	hook through which this target was invoked

 * @target:	struct xt_target through which this function was invoked

 * @targinfo:	per-target data

 *

 * Other fields see above.

 */

struct xt_target_param {

	const struct net_device *in, *out;

	const struct xt_target *target;

	const void *targinfo;

	unsigned int hooknum;

	u_int8_t family;

};



/**

 * struct xt_tgchk_param - parameters for target extensions'

 * checkentry functions
@@ -298,7 +291,7 @@ struct xt_match { 
	   non-linear skb, using skb_header_pointer and

	   skb_ip_make_writable. */

	bool (*match)(const struct sk_buff *skb,

		      const struct xt_match_param *);

		      struct xt_action_param *);



	/* Called when user tries to insert an entry of this type. */

	int (*checkentry)(const struct xt_mtchk_param *);
@@ -335,7 +328,7 @@ struct xt_target { 
	   must now handle non-linear skbs, using skb_copy_bits and

	   skb_ip_make_writable. */

	unsigned int (*target)(struct sk_buff *skb,

			       const struct xt_target_param *);

			       const struct xt_action_param *);



	/* Called when user tries to insert an entry of this type:

           hook_mask is a bitmask of hooks from which it can be

net/bridge/netfilter/ebt_802_3.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/netfilter_bridge/ebt_802_3.h>



static bool

ebt_802_3_mt(const struct sk_buff *skb, const struct xt_match_param *par)

ebt_802_3_mt(const struct sk_buff *skb, struct xt_action_param *par)

{

	const struct ebt_802_3_info *info = par->matchinfo;

	const struct ebt_802_3_hdr *hdr = ebt_802_3_hdr(skb);

net/bridge/netfilter/ebt_among.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int get_ip_src(const struct sk_buff *skb, __be32 *addr) 
}



static bool

ebt_among_mt(const struct sk_buff *skb, const struct xt_match_param *par)

ebt_among_mt(const struct sk_buff *skb, struct xt_action_param *par)

{

	const struct ebt_among_info *info = par->matchinfo;

	const char *dmac, *smac;

net/bridge/netfilter/ebt_arp.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/netfilter_bridge/ebt_arp.h>



static bool

ebt_arp_mt(const struct sk_buff *skb, const struct xt_match_param *par)

ebt_arp_mt(const struct sk_buff *skb, struct xt_action_param *par)

{

	const struct ebt_arp_info *info = par->matchinfo;

	const struct arphdr *ah;

net/bridge/netfilter/ebt_arpreply.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/netfilter_bridge/ebt_arpreply.h>



static unsigned int

ebt_arpreply_tg(struct sk_buff *skb, const struct xt_target_param *par)

ebt_arpreply_tg(struct sk_buff *skb, const struct xt_action_param *par)

{

	const struct ebt_arpreply_info *info = par->targinfo;

	const __be32 *siptr, *diptr;