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

Commit 0ac6ab1f authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

netfilter: Change return types of targets/watchers for Ebtables extensions 



Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 8cc784ee

include/linux/netfilter_bridge/ebtables.h

+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ struct ebt_watcher 
{

	struct list_head list;

	const char name[EBT_FUNCTION_MAXNAMELEN];

	void (*watcher)(const struct sk_buff *skb, unsigned int hooknr,

	unsigned int (*watcher)(const struct sk_buff *skb, unsigned int hooknr,

	   const struct net_device *in, const struct net_device *out,

	   const void *watcherdata, unsigned int datalen);

	bool (*check)(const char *tablename, unsigned int hookmask,
@@ -235,8 +235,8 @@ struct ebt_target 
{

	struct list_head list;

	const char name[EBT_FUNCTION_MAXNAMELEN];

	/* returns one of the standard verdicts */

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

	/* returns one of the standard EBT_* verdicts */

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

	   const struct net_device *in, const struct net_device *out,

	   const void *targetdata, unsigned int datalen);

	bool (*check)(const char *tablename, unsigned int hookmask,

net/bridge/netfilter/ebt_arpreply.c

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

#include <linux/netfilter_bridge/ebt_arpreply.h>



static int ebt_target_reply(struct sk_buff *skb, unsigned int hooknr,

static unsigned int ebt_target_reply(struct sk_buff *skb, unsigned int hooknr,

   const struct net_device *in, const struct net_device *out,

   const void *data, unsigned int datalen)

{

net/bridge/netfilter/ebt_dnat.c

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

#include <linux/netfilter_bridge/ebt_nat.h>



static int ebt_target_dnat(struct sk_buff *skb, unsigned int hooknr,

static unsigned int ebt_target_dnat(struct sk_buff *skb, unsigned int hooknr,

   const struct net_device *in, const struct net_device *out,

   const void *data, unsigned int datalen)

{

net/bridge/netfilter/ebt_log.c

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum, 


}



static void ebt_log(const struct sk_buff *skb, unsigned int hooknr,

static unsigned int ebt_log(const struct sk_buff *skb, unsigned int hooknr,

   const struct net_device *in, const struct net_device *out,

   const void *data, unsigned int datalen)

{
@@ -209,6 +209,7 @@ static void ebt_log(const struct sk_buff *skb, unsigned int hooknr, 
	else

		ebt_log_packet(NFPROTO_BRIDGE, hooknr, skb, in, out, &li,

			       info->prefix);

	return EBT_CONTINUE;

}



static struct ebt_watcher log =

net/bridge/netfilter/ebt_mark.c

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

#include <linux/netfilter_bridge/ebt_mark_t.h>



static int ebt_target_mark(struct sk_buff *skb, unsigned int hooknr,

static unsigned int ebt_target_mark(struct sk_buff *skb, unsigned int hooknr,

   const struct net_device *in, const struct net_device *out,

   const void *data, unsigned int datalen)

{