From patchwork Thu Oct 11 18:01:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 982634 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hQ7gBbgn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42WJhC16PDz9s89 for ; Fri, 12 Oct 2018 05:02:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727128AbeJLBaU (ORCPT ); Thu, 11 Oct 2018 21:30:20 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:46929 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726235AbeJLBaU (ORCPT ); Thu, 11 Oct 2018 21:30:20 -0400 Received: by mail-pg1-f196.google.com with SMTP id a5-v6so4522403pgv.13 for ; Thu, 11 Oct 2018 11:02:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=uRMGKMyl9aoAaCXoPSI2xyLHlYyx/noveJ8qTBm8IkQ=; b=hQ7gBbgnz1KDonF/ybzofK40LnYwz7PDYZAqmCS6BgtH+P9uVYkZEFr0UQRNuCmIt0 2OujAI8irODEUvBp14elTv9npkT/2GbSzGQwroyoGXSpIbnIvpih/w+BXdl7ZcGFIgWW mZGWCwJHjLzdeTEKpL+GdWiFAFNsY134MwgKt8evGlZhlu2kzOSHw2XE/ix/CbxGYqZ7 bfr2VQoe5BQoPP0mQbxjCudmkAhTlR8uES7/ri+fOgYhIop85LKWsNyZVx2ahihLFsB4 g165j6vF4EBnOEzVhoCfytanMptmA1lutrL8/4kmZbxDM+NtB/Vm1klOC/TerUKOwWNl 3toQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=uRMGKMyl9aoAaCXoPSI2xyLHlYyx/noveJ8qTBm8IkQ=; b=oJSPwXNzs1Ft64yJNvFUNlweyZEGE94ROEDvoeo5wOq7RVWVQANgT2xZUkFKz0ZTDZ c68j4kFbAkXqxd01flV7bL1rrZWJG850T8MeCibi+YGaN6GgaUUR0IHvLAxmAbHCaB8K 1Wl6e197eHYfboioUIhub3w4yttbKXlhJ1DSaVTOWLdbOZ6DQWBIQNf/Y7TH8HT5LLAp trRacLrkOP4JAoC1O6DT8cjlTLtMCDSGVxoSddUsIBcZ00NWQKx1kR8eAZkncWfiCU8b Fs5YxQ0D8auOE9MFb+liD/QULRyBi4bdsM16uPNXBWvkeyWF44njqWxrX5Pb7o2+Q0xw coqA== X-Gm-Message-State: ABuFfogi+pvVcTUMnMSzNYibwnPUoTQXXBkT1UyKSqE3kteTJ7uc9zBy vyX2H6ZWCMGFDDhoz12+Lpc= X-Google-Smtp-Source: ACcGV60AYwen00V3WOh5REULfgAUlVMRIbtSaFAoFPo4nOB55iKpbG5OxP3/VrFLM/cWPWyIm3Z5vg== X-Received: by 2002:a65:638a:: with SMTP id h10-v6mr2334579pgv.136.1539280920889; Thu, 11 Oct 2018 11:02:00 -0700 (PDT) Received: from ap-To-be-filled-by-O-E-M.8.8.8.8 ([125.130.197.10]) by smtp.gmail.com with ESMTPSA id u79-v6sm44657567pfd.117.2018.10.11.11.01.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 11:02:00 -0700 (PDT) From: Taehee Yoo To: pablo@netfilter.org, netfilter-devel@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH nf-next] netfilter: nf_flow_table: remove unnecessary parameter of nf_flow_table_cleanup() Date: Fri, 12 Oct 2018 03:01:54 +0900 Message-Id: <20181011180154.5830-1-ap420073@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org parameter net of nf_flow_table_cleanup() is not used. So that it can be removed. Signed-off-by: Taehee Yoo --- 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; }