netfilter: Refactor nf_conncount
Remove parameter 'family' in nf_conncount_count() and count_tree().
It is because the parameter is not useful after commit 625c556118
("netfilter: connlimit: split xt_connlimit into front and backend").
Signed-off-by: Yi-Hung Wei <yihung.wei@gmail.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
parent
a55efe1d41
commit
6aec208786
|
@ -11,7 +11,6 @@ void nf_conncount_destroy(struct net *net, unsigned int family,
|
|||
unsigned int nf_conncount_count(struct net *net,
|
||||
struct nf_conncount_data *data,
|
||||
const u32 *key,
|
||||
unsigned int family,
|
||||
const struct nf_conntrack_tuple *tuple,
|
||||
const struct nf_conntrack_zone *zone);
|
||||
#endif
|
||||
|
|
|
@ -158,7 +158,6 @@ static void tree_nodes_free(struct rb_root *root,
|
|||
static unsigned int
|
||||
count_tree(struct net *net, struct rb_root *root,
|
||||
const u32 *key, u8 keylen,
|
||||
u8 family,
|
||||
const struct nf_conntrack_tuple *tuple,
|
||||
const struct nf_conntrack_zone *zone)
|
||||
{
|
||||
|
@ -246,7 +245,6 @@ count_tree(struct net *net, struct rb_root *root,
|
|||
unsigned int nf_conncount_count(struct net *net,
|
||||
struct nf_conncount_data *data,
|
||||
const u32 *key,
|
||||
unsigned int family,
|
||||
const struct nf_conntrack_tuple *tuple,
|
||||
const struct nf_conntrack_zone *zone)
|
||||
{
|
||||
|
@ -259,7 +257,7 @@ unsigned int nf_conncount_count(struct net *net,
|
|||
|
||||
spin_lock_bh(&nf_conncount_locks[hash % CONNCOUNT_LOCK_SLOTS]);
|
||||
|
||||
count = count_tree(net, root, key, data->keylen, family, tuple, zone);
|
||||
count = count_tree(net, root, key, data->keylen, tuple, zone);
|
||||
|
||||
spin_unlock_bh(&nf_conncount_locks[hash % CONNCOUNT_LOCK_SLOTS]);
|
||||
|
||||
|
|
|
@ -67,8 +67,8 @@ connlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)
|
|||
key[1] = zone->id;
|
||||
}
|
||||
|
||||
connections = nf_conncount_count(net, info->data, key,
|
||||
xt_family(par), tuple_ptr, zone);
|
||||
connections = nf_conncount_count(net, info->data, key, tuple_ptr,
|
||||
zone);
|
||||
if (connections == 0)
|
||||
/* kmalloc failed, drop it entirely */
|
||||
goto hotdrop;
|
||||
|
|
Loading…
Reference in a new issue