| Message ID | 20190110033204.31413-3-mfo@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | netfilter: nf_conncount: fix for LP#1811094 | expand |
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c index 1152a4bb7b9b..79c3156e12b6 100644 --- a/net/netfilter/xt_connlimit.c +++ b/net/netfilter/xt_connlimit.c @@ -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;
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 625c556118f3 ("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: Mauricio Faria de Oliveira <mfo@canonical.com> --- net/netfilter/xt_connlimit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)