diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-07-10 18:55:11 +0200 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2010-03-25 15:02:19 +0100 |
commit | d2a7b6bad2c38e41eddb0b24d03627d9e7aa3f7b (patch) | |
tree | 826eb9d112029819aa44925346a55f887b1c3baf /net/ipv4/netfilter/ip_tables.c | |
parent | ff67e4e42bd178b1179c4d8e5c1fde18758ce84f (diff) | |
download | linux-3.10-d2a7b6bad2c38e41eddb0b24d03627d9e7aa3f7b.tar.gz linux-3.10-d2a7b6bad2c38e41eddb0b24d03627d9e7aa3f7b.tar.bz2 linux-3.10-d2a7b6bad2c38e41eddb0b24d03627d9e7aa3f7b.zip |
netfilter: xtables: make use of xt_request_find_target
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/ipv4/netfilter/ip_tables.c')
-rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 73fdf20263e..e24ec48ee8c 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c @@ -701,13 +701,11 @@ find_check_entry(struct ipt_entry *e, struct net *net, const char *name, } t = ipt_get_target(e); - target = try_then_request_module(xt_find_target(AF_INET, - t->u.user.name, - t->u.user.revision), - "ipt_%s", t->u.user.name); - if (IS_ERR(target) || !target) { + target = xt_request_find_target(NFPROTO_IPV4, t->u.user.name, + t->u.user.revision); + if (IS_ERR(target)) { duprintf("find_check_entry: `%s' not found\n", t->u.user.name); - ret = target ? PTR_ERR(target) : -ENOENT; + ret = PTR_ERR(target); goto cleanup_matches; } t->u.kernel.target = target; @@ -1547,14 +1545,12 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e, } t = compat_ipt_get_target(e); - target = try_then_request_module(xt_find_target(AF_INET, - t->u.user.name, - t->u.user.revision), - "ipt_%s", t->u.user.name); - if (IS_ERR(target) || !target) { + target = xt_request_find_target(NFPROTO_IPV4, t->u.user.name, + t->u.user.revision); + if (IS_ERR(target)) { duprintf("check_compat_entry_size_and_hooks: `%s' not found\n", t->u.user.name); - ret = target ? PTR_ERR(target) : -ENOENT; + ret = PTR_ERR(target); goto release_matches; } t->u.kernel.target = target; |