diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2008-10-08 11:35:15 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2008-10-08 11:35:15 +0200 |
commit | 2d06d4a5cc107046508d860a0b47dbc43b829b79 (patch) | |
tree | f3ff0b039d27ba0c5b802e6468b8960b943ab8fb /net/bridge/netfilter/ebt_ip.c | |
parent | 815377fe344c799228ca6278613ca3100b069ad5 (diff) | |
download | kernel_samsung_smdk4412-2d06d4a5cc107046508d860a0b47dbc43b829b79.zip kernel_samsung_smdk4412-2d06d4a5cc107046508d860a0b47dbc43b829b79.tar.gz kernel_samsung_smdk4412-2d06d4a5cc107046508d860a0b47dbc43b829b79.tar.bz2 |
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_ip.c')
-rw-r--r-- | net/bridge/netfilter/ebt_ip.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/net/bridge/netfilter/ebt_ip.c b/net/bridge/netfilter/ebt_ip.c index 0bef6f7..e7f3b17 100644 --- a/net/bridge/netfilter/ebt_ip.c +++ b/net/bridge/netfilter/ebt_ip.c @@ -24,10 +24,10 @@ struct tcpudphdr { __be16 dst; }; -static bool ebt_filter_ip(const struct sk_buff *skb, - const struct net_device *in, - const struct net_device *out, const void *data, - unsigned int datalen) +static bool +ebt_ip_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_ip_info *info = data; const struct iphdr *ih; @@ -79,10 +79,13 @@ static bool ebt_filter_ip(const struct sk_buff *skb, return true; } -static bool ebt_ip_check(const char *tablename, unsigned int hookmask, - const struct ebt_entry *e, void *data, unsigned int datalen) +static bool +ebt_ip_mt_check(const char *table, const void *entry, + const struct xt_match *match, void *data, + unsigned int hook_mask) { const struct ebt_ip_info *info = data; + const struct ebt_entry *e = entry; if (e->ethproto != htons(ETH_P_IP) || e->invflags & EBT_IPROTO) @@ -110,8 +113,8 @@ static struct ebt_match filter_ip __read_mostly = { .name = EBT_IP_MATCH, .revision = 0, .family = NFPROTO_BRIDGE, - .match = ebt_filter_ip, - .check = ebt_ip_check, + .match = ebt_ip_mt, + .checkentry = ebt_ip_mt_check, .matchsize = XT_ALIGN(sizeof(struct ebt_ip_info)), .me = THIS_MODULE, }; |