aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-02-03 07:45:12 -0500
committerPatrick McHardy <kaber@trash.net>2010-02-03 07:45:12 -0500
commitadd67461240c1dadc7c8d97e66f8f92b556ca523 (patch)
treedac0f8982130e407ac184fb55d18140a3ebcef5d /net/ipv6
parent794e68716bab578ae8f8912dc934496d7c7abc90 (diff)
netfilter: add struct net * to target parameters
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/netfilter/ip6_tables.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 9f1d45f2ba8f..0376ed6d5594 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -669,10 +669,11 @@ err:
669 return ret; 669 return ret;
670} 670}
671 671
672static int check_target(struct ip6t_entry *e, const char *name) 672static int check_target(struct ip6t_entry *e, struct net *net, const char *name)
673{ 673{
674 struct ip6t_entry_target *t = ip6t_get_target(e); 674 struct ip6t_entry_target *t = ip6t_get_target(e);
675 struct xt_tgchk_param par = { 675 struct xt_tgchk_param par = {
676 .net = net,
676 .table = name, 677 .table = name,
677 .entryinfo = e, 678 .entryinfo = e,
678 .target = t->u.kernel.target, 679 .target = t->u.kernel.target,
@@ -729,7 +730,7 @@ find_check_entry(struct ip6t_entry *e, struct net *net, const char *name,
729 } 730 }
730 t->u.kernel.target = target; 731 t->u.kernel.target = target;
731 732
732 ret = check_target(e, name); 733 ret = check_target(e, net, name);
733 if (ret) 734 if (ret)
734 goto err; 735 goto err;
735 736
@@ -820,6 +821,7 @@ cleanup_entry(struct ip6t_entry *e, struct net *net, unsigned int *i)
820 IP6T_MATCH_ITERATE(e, cleanup_match, net, NULL); 821 IP6T_MATCH_ITERATE(e, cleanup_match, net, NULL);
821 t = ip6t_get_target(e); 822 t = ip6t_get_target(e);
822 823
824 par.net = net;
823 par.target = t->u.kernel.target; 825 par.target = t->u.kernel.target;
824 par.targinfo = t->data; 826 par.targinfo = t->data;
825 par.family = NFPROTO_IPV6; 827 par.family = NFPROTO_IPV6;
@@ -1710,7 +1712,7 @@ static int compat_check_entry(struct ip6t_entry *e, struct net *net,
1710 if (ret) 1712 if (ret)
1711 goto cleanup_matches; 1713 goto cleanup_matches;
1712 1714
1713 ret = check_target(e, name); 1715 ret = check_target(e, net, name);
1714 if (ret) 1716 if (ret)
1715 goto cleanup_matches; 1717 goto cleanup_matches;
1716 1718