From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 07/10] netfilter: nf_flow_table: remove unnecessary parameter of nf_flow_table_cleanup()
Date: Sat, 20 Oct 2018 11:43:14 +0200 [thread overview]
Message-ID: <20181020094317.16011-8-pablo@netfilter.org> (raw)
In-Reply-To: <20181020094317.16011-1-pablo@netfilter.org>
From: Taehee Yoo <ap420073@gmail.com>
parameter net of nf_flow_table_cleanup() is not used.
So that it can be removed.
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
include/net/netfilter/nf_flow_table.h | 2 +-
net/netfilter/nf_flow_table_core.c | 2 +-
net/netfilter/nft_flow_offload.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h
index 0e355f4a3d76..77e2761d4f2f 100644
--- a/include/net/netfilter/nf_flow_table.h
+++ b/include/net/netfilter/nf_flow_table.h
@@ -99,7 +99,7 @@ int nf_flow_table_iterate(struct nf_flowtable *flow_table,
void (*iter)(struct flow_offload *flow, void *data),
void *data);
-void nf_flow_table_cleanup(struct net *net, struct net_device *dev);
+void nf_flow_table_cleanup(struct net_device *dev);
int nf_flow_table_init(struct nf_flowtable *flow_table);
void nf_flow_table_free(struct nf_flowtable *flow_table);
diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index 185c633b6872..a3cc2ef8a48a 100644
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -483,7 +483,7 @@ static void nf_flow_table_iterate_cleanup(struct nf_flowtable *flowtable,
flush_delayed_work(&flowtable->gc_work);
}
-void nf_flow_table_cleanup(struct net *net, struct net_device *dev)
+void nf_flow_table_cleanup(struct net_device *dev)
{
struct nf_flowtable *flowtable;
diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
index d6bab8c3cbb0..e82d9a966c45 100644
--- a/net/netfilter/nft_flow_offload.c
+++ b/net/netfilter/nft_flow_offload.c
@@ -201,7 +201,7 @@ static int flow_offload_netdev_event(struct notifier_block *this,
if (event != NETDEV_DOWN)
return NOTIFY_DONE;
- nf_flow_table_cleanup(dev_net(dev), dev);
+ nf_flow_table_cleanup(dev);
return NOTIFY_DONE;
}
--
2.11.0
next prev parent reply other threads:[~2018-10-20 9:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-20 9:43 [PATCH 00/10] Netfilter updates for net-next Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 01/10] netfilter: Replace spin_is_locked() with lockdep Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 02/10] netfilter: cttimeout: remove set but not used variable 'l3num' Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 03/10] netfilter: nft_osf: Add ttl option support Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 04/10] netfilter: nft_xfrm: use state family, not hook one Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 05/10] netfilter: xt_osf: simplify xt_osf_match_packet() Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 06/10] netfilter: nf_nat_snmp_basic: add missing helper alias name Pablo Neira Ayuso
2018-10-20 9:43 ` Pablo Neira Ayuso [this message]
2018-10-20 9:43 ` [PATCH 08/10] netfilter: remove two unused variables Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 09/10] netfilter: nfnetlink_log: remove empty nfnetlink_log.h header file Pablo Neira Ayuso
2018-10-20 9:43 ` [PATCH 10/10] Revert "netfilter: xt_quota: fix the behavior of xt_quota module" Pablo Neira Ayuso
2018-10-20 19:33 ` [PATCH 00/10] Netfilter updates for net-next David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181020094317.16011-8-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).