diff options
author | Patrick McHardy <kaber@trash.net> | 2010-02-03 07:45:12 -0500 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-02-03 07:45:12 -0500 |
commit | add67461240c1dadc7c8d97e66f8f92b556ca523 (patch) | |
tree | dac0f8982130e407ac184fb55d18140a3ebcef5d /net/ipv4 | |
parent | 794e68716bab578ae8f8912dc934496d7c7abc90 (diff) |
netfilter: add struct net * to target parameters
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index cfaba0e2e6fc..7fde8f6950d8 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
@@ -638,10 +638,11 @@ err: | |||
638 | return ret; | 638 | return ret; |
639 | } | 639 | } |
640 | 640 | ||
641 | static int check_target(struct ipt_entry *e, const char *name) | 641 | static int check_target(struct ipt_entry *e, struct net *net, const char *name) |
642 | { | 642 | { |
643 | struct ipt_entry_target *t = ipt_get_target(e); | 643 | struct ipt_entry_target *t = ipt_get_target(e); |
644 | struct xt_tgchk_param par = { | 644 | struct xt_tgchk_param par = { |
645 | .net = net, | ||
645 | .table = name, | 646 | .table = name, |
646 | .entryinfo = e, | 647 | .entryinfo = e, |
647 | .target = t->u.kernel.target, | 648 | .target = t->u.kernel.target, |
@@ -697,7 +698,7 @@ find_check_entry(struct ipt_entry *e, struct net *net, const char *name, | |||
697 | } | 698 | } |
698 | t->u.kernel.target = target; | 699 | t->u.kernel.target = target; |
699 | 700 | ||
700 | ret = check_target(e, name); | 701 | ret = check_target(e, net, name); |
701 | if (ret) | 702 | if (ret) |
702 | goto err; | 703 | goto err; |
703 | 704 | ||
@@ -788,6 +789,7 @@ cleanup_entry(struct ipt_entry *e, struct net *net, unsigned int *i) | |||
788 | IPT_MATCH_ITERATE(e, cleanup_match, net, NULL); | 789 | IPT_MATCH_ITERATE(e, cleanup_match, net, NULL); |
789 | t = ipt_get_target(e); | 790 | t = ipt_get_target(e); |
790 | 791 | ||
792 | par.net = net; | ||
791 | par.target = t->u.kernel.target; | 793 | par.target = t->u.kernel.target; |
792 | par.targinfo = t->data; | 794 | par.targinfo = t->data; |
793 | par.family = NFPROTO_IPV4; | 795 | par.family = NFPROTO_IPV4; |
@@ -1675,7 +1677,7 @@ compat_check_entry(struct ipt_entry *e, struct net *net, const char *name, | |||
1675 | if (ret) | 1677 | if (ret) |
1676 | goto cleanup_matches; | 1678 | goto cleanup_matches; |
1677 | 1679 | ||
1678 | ret = check_target(e, name); | 1680 | ret = check_target(e, net, name); |
1679 | if (ret) | 1681 | if (ret) |
1680 | goto cleanup_matches; | 1682 | goto cleanup_matches; |
1681 | 1683 | ||