summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/net/netfilter/ipset/ip_set_hash_gen.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/kernel/net/netfilter/ipset/ip_set_hash_gen.h b/kernel/net/netfilter/ipset/ip_set_hash_gen.h
index c9f0db6..673c7aa 100644
--- a/kernel/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/kernel/net/netfilter/ipset/ip_set_hash_gen.h
@@ -17,9 +17,7 @@
#define ipset_dereference_protected(p, set) \
__ipset_dereference_protected(p, spin_is_locked(&(set)->lock))
-#ifndef rcu_dereference_bh_nfnl
-#define rcu_dereference_bh_nfnl(p, ss) rcu_dereference_bh_check(p, 1)
-#endif
+#define rcu_dereference_bh_nfnl(p) rcu_dereference_bh_check(p, 1)
/* Hashing which uses arrays to resolve clashing. The hash table is resized
* (doubled) when searching becomes too long.
@@ -570,7 +568,7 @@ mtype_resize(struct ip_set *set, bool retried)
return -ENOMEM;
#endif
rcu_read_lock_bh();
- orig = rcu_dereference_bh_nfnl(h->table, NFNL_SUBSYS_IPSET);
+ orig = rcu_dereference_bh_nfnl(h->table);
htable_bits = orig->htable_bits;
rcu_read_unlock_bh();
@@ -1051,7 +1049,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
u8 htable_bits;
rcu_read_lock_bh();
- t = rcu_dereference_bh_nfnl(h->table, NFNL_SUBSYS_IPSET);
+ t = rcu_dereference_bh_nfnl(h->table);
memsize = mtype_ahash_memsize(h, t) + set->ext_size;
htable_bits = t->htable_bits;
rcu_read_unlock_bh();
@@ -1094,7 +1092,7 @@ mtype_uref(struct ip_set *set, struct netlink_callback *cb, bool start)
if (start) {
rcu_read_lock_bh();
- t = rcu_dereference_bh_nfnl(h->table, NFNL_SUBSYS_IPSET);
+ t = rcu_dereference_bh_nfnl(h->table);
atomic_inc(&t->uref);
cb->args[IPSET_CB_PRIVATE] = (unsigned long)t;
rcu_read_unlock_bh();