Commit 2613eb70 authored by Mauricio Faria de Oliveira's avatar Mauricio Faria de Oliveira Committed by Kleber Sacilotto de Souza

UBUNTU: SAUCE: netfilter: xt_connlimit: remove the 'addr' parameter in add_hlist()

BugLink: https://bugs.launchpad.net/bugs/1811094

The previous commit made the 'addr' parameter in add_hlist() unused.  So remove it
with a SAUCE patch, to simplify the backport of the next patches, as it is removed
anyway in upstream later (but before the next patches) through commit 625c5561
("netfilter: connlimit: split xt_connlimit into front and backend"), in the rename
from 'xt_connlimit.c' to 'nf_conncount.c', which is a large refactor we don't need.
Signed-off-by: default avatarMauricio Faria de Oliveira <mfo@canonical.com>
Acked-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 68624819
......@@ -116,8 +116,7 @@ same_source_net(const union nf_inet_addr *addr,
}
static bool add_hlist(struct hlist_head *head,
const struct nf_conntrack_tuple *tuple,
const union nf_inet_addr *addr)
const struct nf_conntrack_tuple *tuple)
{
struct xt_connlimit_conn *conn;
......@@ -233,7 +232,7 @@ count_tree(struct net *net, struct rb_root *root,
if (!addit)
return count;
if (!add_hlist(&rbconn->hhead, tuple, addr))
if (!add_hlist(&rbconn->hhead, tuple))
return 0; /* hotdrop */
return count + 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment