diff options
author | 2008-10-08 11:35:15 +0200 | |
---|---|---|
committer | 2008-10-08 11:35:15 +0200 | |
commit | 2d06d4a5cc107046508d860a0b47dbc43b829b79 (patch) | |
tree | f3ff0b039d27ba0c5b802e6468b8960b943ab8fb /net/bridge/netfilter/ebt_pkttype.c | |
parent | netfilter: ebt_among: obtain match size through different means (diff) | |
download | linux-2d06d4a5cc107046508d860a0b47dbc43b829b79.tar.gz linux-2d06d4a5cc107046508d860a0b47dbc43b829b79.tar.bz2 linux-2d06d4a5cc107046508d860a0b47dbc43b829b79.zip |
netfilter: change Ebtables function signatures to match Xtables's
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/bridge/netfilter/ebt_pkttype.c')
-rw-r--r-- | net/bridge/netfilter/ebt_pkttype.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/net/bridge/netfilter/ebt_pkttype.c b/net/bridge/netfilter/ebt_pkttype.c index a9acecc88e9e..06393452ef91 100644 --- a/net/bridge/netfilter/ebt_pkttype.c +++ b/net/bridge/netfilter/ebt_pkttype.c @@ -12,19 +12,21 @@ #include <linux/netfilter_bridge/ebtables.h> #include <linux/netfilter_bridge/ebt_pkttype.h> -static bool ebt_filter_pkttype(const struct sk_buff *skb, - const struct net_device *in, - const struct net_device *out, - const void *data, - unsigned int datalen) +static bool +ebt_pkttype_mt(const struct sk_buff *skb, const struct net_device *in, + const struct net_device *out, const struct xt_match *match, + const void *data, int offset, unsigned int protoff, + bool *hotdrop) { const struct ebt_pkttype_info *info = data; return (skb->pkt_type == info->pkt_type) ^ info->invert; } -static bool ebt_pkttype_check(const char *tablename, unsigned int hookmask, - const struct ebt_entry *e, void *data, unsigned int datalen) +static bool +ebt_pkttype_mt_check(const char *table, const void *e, + const struct xt_match *match, void *data, + unsigned int hook_mask) { const struct ebt_pkttype_info *info = data; @@ -38,8 +40,8 @@ static struct ebt_match filter_pkttype __read_mostly = { .name = EBT_PKTTYPE_MATCH, .revision = 0, .family = NFPROTO_BRIDGE, - .match = ebt_filter_pkttype, - .check = ebt_pkttype_check, + .match = ebt_pkttype_mt, + .checkentry = ebt_pkttype_mt_check, .matchsize = XT_ALIGN(sizeof(struct ebt_pkttype_info)), .me = THIS_MODULE, }; |