lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: xtables: consolidate code into xt_request_find_match

Browse Source 
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
This commit is contained in:
Jan Engelhardt
2009-07-10 19:27:47 +02:00
parent d2a7b6bad2
commit fd0ec0e621
5 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/ipv6/netfilter/ip6_tables.c
View File

@@ -660,12 +660,11 @@ find_check_match(struct ip6t_entry_match *m, struct xt_mtchk_param *par)
struct xt_match *match;
int ret;
match = try_then_request_module(xt_find_match(AF_INET6, m->u.user.name,
m->u.user.revision),
"ip6t_%s", m->u.user.name);
if (IS_ERR(match) || !match) {
match = xt_request_find_match(NFPROTO_IPV6, m->u.user.name,
m->u.user.revision);
if (IS_ERR(match)) {
duprintf("find_check_match: `%s' not found\n", m->u.user.name);
return match ? PTR_ERR(match) : -ENOENT;
return PTR_ERR(match);
}
m->u.kernel.match = match;
@@ -1506,13 +1505,12 @@ compat_find_calc_match(struct ip6t_entry_match *m,
{
struct xt_match *match;
match = try_then_request_module(xt_find_match(AF_INET6, m->u.user.name,
m->u.user.revision),
"ip6t_%s", m->u.user.name);
if (IS_ERR(match) || !match) {
match = xt_request_find_match(NFPROTO_IPV6, m->u.user.name,
m->u.user.revision);
if (IS_ERR(match)) {
duprintf("compat_check_calc_match: `%s' not found\n",
m->u.user.name);
return match ? PTR_ERR(match) : -ENOENT;
return PTR_ERR(match);
}
m->u.kernel.match = match;
*size += xt_compat_match_offset(match);