diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-05-10 23:03:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-10 23:03:26 -0700 |
| commit | d250fe91ae129bff0968e685cc9c466d3a5e3482 (patch) | |
| tree | e38b7628a5c6afb80c22341759f392585e558cb1 /net/bridge/netfilter/ebt_redirect.c | |
| parent | net: trans_start cleanups (diff) | |
| parent | netfilter: use rcu_dereference_protected() (diff) | |
| download | linux-dev-d250fe91ae129bff0968e685cc9c466d3a5e3482.tar.xz linux-dev-d250fe91ae129bff0968e685cc9c466d3a5e3482.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'net/bridge/netfilter/ebt_redirect.c')
| -rw-r--r-- | net/bridge/netfilter/ebt_redirect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c index 9be8fbcd370b..a6044a6f2383 100644 --- a/net/bridge/netfilter/ebt_redirect.c +++ b/net/bridge/netfilter/ebt_redirect.c @@ -32,23 +32,23 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_target_param *par) return info->target; } -static bool ebt_redirect_tg_check(const struct xt_tgchk_param *par) +static int ebt_redirect_tg_check(const struct xt_tgchk_param *par) { const struct ebt_redirect_info *info = par->targinfo; unsigned int hook_mask; if (BASE_CHAIN && info->target == EBT_RETURN) - return false; + return -EINVAL; hook_mask = par->hook_mask & ~(1 << NF_BR_NUMHOOKS); if ((strcmp(par->table, "nat") != 0 || hook_mask & ~(1 << NF_BR_PRE_ROUTING)) && (strcmp(par->table, "broute") != 0 || hook_mask & ~(1 << NF_BR_BROUTING))) - return false; + return -EINVAL; if (INVALID_TARGET) - return false; - return true; + return -EINVAL; + return 0; } static struct xt_target ebt_redirect_tg_reg __read_mostly = { |