diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-07-10 12:55:11 -0400 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2010-03-25 10:02:19 -0400 |
commit | d2a7b6bad2c38e41eddb0b24d03627d9e7aa3f7b (patch) | |
tree | 826eb9d112029819aa44925346a55f887b1c3baf /net/ipv6 | |
parent | ff67e4e42bd178b1179c4d8e5c1fde18758ce84f (diff) |
netfilter: xtables: make use of xt_request_find_target
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 1b2414e03a34..842bef374dcc 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c | |||
@@ -733,13 +733,11 @@ find_check_entry(struct ip6t_entry *e, struct net *net, const char *name, | |||
733 | } | 733 | } |
734 | 734 | ||
735 | t = ip6t_get_target(e); | 735 | t = ip6t_get_target(e); |
736 | target = try_then_request_module(xt_find_target(AF_INET6, | 736 | target = xt_request_find_target(NFPROTO_IPV6, t->u.user.name, |
737 | t->u.user.name, | 737 | t->u.user.revision); |
738 | t->u.user.revision), | 738 | if (IS_ERR(target)) { |
739 | "ip6t_%s", t->u.user.name); | ||
740 | if (IS_ERR(target) || !target) { | ||
741 | duprintf("find_check_entry: `%s' not found\n", t->u.user.name); | 739 | duprintf("find_check_entry: `%s' not found\n", t->u.user.name); |
742 | ret = target ? PTR_ERR(target) : -ENOENT; | 740 | ret = PTR_ERR(target); |
743 | goto cleanup_matches; | 741 | goto cleanup_matches; |
744 | } | 742 | } |
745 | t->u.kernel.target = target; | 743 | t->u.kernel.target = target; |
@@ -1581,14 +1579,12 @@ check_compat_entry_size_and_hooks(struct compat_ip6t_entry *e, | |||
1581 | } | 1579 | } |
1582 | 1580 | ||
1583 | t = compat_ip6t_get_target(e); | 1581 | t = compat_ip6t_get_target(e); |
1584 | target = try_then_request_module(xt_find_target(AF_INET6, | 1582 | target = xt_request_find_target(NFPROTO_IPV6, t->u.user.name, |
1585 | t->u.user.name, | 1583 | t->u.user.revision); |
1586 | t->u.user.revision), | 1584 | if (IS_ERR(target)) { |
1587 | "ip6t_%s", t->u.user.name); | ||
1588 | if (IS_ERR(target) || !target) { | ||
1589 | duprintf("check_compat_entry_size_and_hooks: `%s' not found\n", | 1585 | duprintf("check_compat_entry_size_and_hooks: `%s' not found\n", |
1590 | t->u.user.name); | 1586 | t->u.user.name); |
1591 | ret = target ? PTR_ERR(target) : -ENOENT; | 1587 | ret = PTR_ERR(target); |
1592 | goto release_matches; | 1588 | goto release_matches; |
1593 | } | 1589 | } |
1594 | t->u.kernel.target = target; | 1590 | t->u.kernel.target = target; |