netfilter: x_tables: move hook state into xt_action_param structure

[mirror_ubuntu-artful-kernel.git] / net / netfilter / ipset / ip_set_core.c

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index a748b0c2c981482eb853159f96ac69b563aebae8..3f1b945a24d5cfa5d36fb6b30cfa6bd965b6db04 100644 (file)
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -541,7 +541,7 @@ int
 ip_set_test(ip_set_id_t index, const struct sk_buff *skb,
            const struct xt_action_param *par, struct ip_set_adt_opt *opt)
 {
-       struct ip_set *set = ip_set_rcu_get(par->net, index);
+       struct ip_set *set = ip_set_rcu_get(xt_net(par), index);
        int ret = 0;
 
        BUG_ON(!set);
@@ -579,7 +579,7 @@ int
 ip_set_add(ip_set_id_t index, const struct sk_buff *skb,
           const struct xt_action_param *par, struct ip_set_adt_opt *opt)
 {
-       struct ip_set *set = ip_set_rcu_get(par->net, index);
+       struct ip_set *set = ip_set_rcu_get(xt_net(par), index);
        int ret;
 
        BUG_ON(!set);
@@ -601,7 +601,7 @@ int
 ip_set_del(ip_set_id_t index, const struct sk_buff *skb,
           const struct xt_action_param *par, struct ip_set_adt_opt *opt)
 {
-       struct ip_set *set = ip_set_rcu_get(par->net, index);
+       struct ip_set *set = ip_set_rcu_get(xt_net(par), index);
        int ret = 0;
 
        BUG_ON(!set);