From patchwork Sun Feb 11 14:28:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taehee Yoo X-Patchwork-Id: 871767 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KIoWuKIv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zfWPV2l0Sz9t3C for ; Mon, 12 Feb 2018 01:28:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753243AbeBKO22 (ORCPT ); Sun, 11 Feb 2018 09:28:28 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36262 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751077AbeBKO21 (ORCPT ); Sun, 11 Feb 2018 09:28:27 -0500 Received: by mail-pf0-f193.google.com with SMTP id p8so1020949pff.3 for ; Sun, 11 Feb 2018 06:28:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=5Tyo4Ye2+j5BW/KyA7kY7LP7Vq/AQTjTSFIflOR7QyA=; b=KIoWuKIvw+KdCGQiEzhrwJMnpNSck/DUxQFXeUH6+An7ud5M46PFq0WFNorv+5cdVD 7zzCY/XjeYbPhLK6OC3+MTQzearQOaKW4pIimE/AneyJFsrpFfszsufjlu38DvTTS7Sh 2ih0DcSUKX9A1n1/yU4X9C7w5+l532q372Q3+nkGGpCyVdyTJY0pABPqTICA4TAIxPOU fD2YoKsvKvK2pf5jyYtirNDxSasFPkGR/di8jtp6tfNP61mG7kBjtzOGN72f99+auMlV OyFOqDtRN+UWkLn5M48esdsGginUm3yICtidBiC6PaVbPCqcGtKQYjxqtkNHaER9pNEp /JxA== 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=5Tyo4Ye2+j5BW/KyA7kY7LP7Vq/AQTjTSFIflOR7QyA=; b=LOtrNsB4nvKNePGyhDU08wuDwVvHNFQmjYHFMUVxYPZ0G6EikkUQ4B6Nyi6bqFWiq1 GATQpb951YBop6u4d8E3xie7hllAqpy53UYeHYT9XtwAm9d1vIKB07PTF0AxG1Lrl1W1 E7N9NmSkKDdYzN917x9xKMosAfhidRXrmn5szwBaXgNxANeGaC7Ui6aAh3NZ4/4MVM0+ vQaaSJD5y0PGEFESWyoGz8DDJzDbNqkGzyYitDMQ156qHSbOVgGDZ6L5oOVAzVXdk2NV KzEq6MjY4Kiq+3/4IZo4BMJmRzwPcB+bWRboAgk1WNB4DPasSY93UZvFeZoPXbu2DReB XheQ== X-Gm-Message-State: APf1xPA4U6r2/BSiwxqHIhLrBAJd5qaqxz23yrfi+hCkfoQ62UNitRuQ 0Y/V83A8hfGj/rJhQinHMWY= X-Google-Smtp-Source: AH8x226xMzGhNZWfjygPJxd6dVJ7OTI4/7fsNY66v14GY4s0bVS01dNAVOMZiWlYksqM7kfsyoR4xg== X-Received: by 10.98.8.141 with SMTP id 13mr8913408pfi.213.1518359307151; Sun, 11 Feb 2018 06:28:27 -0800 (PST) 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 t126sm13707375pgb.85.2018.02.11.06.28.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Feb 2018 06:28:25 -0800 (PST) From: Taehee Yoo To: pablo@netfilter.org, netfilter-devel@vger.kernel.org Cc: ap420073@gmail.com Subject: [PATCH] netfilter: nf_conntrack_broadcast: remove useless parameter Date: Sun, 11 Feb 2018 23:28:18 +0900 Message-Id: <20180211142818.9890-1-ap420073@gmail.com> X-Mailer: git-send-email 2.9.3 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org parameter protoff in nf_conntrack_broadcast_help is not used anywhere. Signed-off-by: Taehee Yoo --- include/net/netfilter/nf_conntrack_helper.h | 3 +-- net/netfilter/nf_conntrack_broadcast.c | 1 - net/netfilter/nf_conntrack_netbios_ns.c | 5 +++-- net/netfilter/nf_conntrack_snmp.c | 5 +++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h index fc39bba..32c2a94 100644 --- a/include/net/netfilter/nf_conntrack_helper.h +++ b/include/net/netfilter/nf_conntrack_helper.h @@ -132,8 +132,7 @@ void nf_conntrack_helper_pernet_fini(struct net *net); int nf_conntrack_helper_init(void); void nf_conntrack_helper_fini(void); -int nf_conntrack_broadcast_help(struct sk_buff *skb, unsigned int protoff, - struct nf_conn *ct, +int nf_conntrack_broadcast_help(struct sk_buff *skb, struct nf_conn *ct, enum ip_conntrack_info ctinfo, unsigned int timeout); diff --git a/net/netfilter/nf_conntrack_broadcast.c b/net/netfilter/nf_conntrack_broadcast.c index ecc3ab7..a1086bd 100644 --- a/net/netfilter/nf_conntrack_broadcast.c +++ b/net/netfilter/nf_conntrack_broadcast.c @@ -20,7 +20,6 @@ #include int nf_conntrack_broadcast_help(struct sk_buff *skb, - unsigned int protoff, struct nf_conn *ct, enum ip_conntrack_info ctinfo, unsigned int timeout) diff --git a/net/netfilter/nf_conntrack_netbios_ns.c b/net/netfilter/nf_conntrack_netbios_ns.c index 496ce17..a4a59dc 100644 --- a/net/netfilter/nf_conntrack_netbios_ns.c +++ b/net/netfilter/nf_conntrack_netbios_ns.c @@ -41,9 +41,10 @@ static struct nf_conntrack_expect_policy exp_policy = { }; static int netbios_ns_help(struct sk_buff *skb, unsigned int protoff, - struct nf_conn *ct, enum ip_conntrack_info ctinfo) + struct nf_conn *ct, + enum ip_conntrack_info ctinfo) { - return nf_conntrack_broadcast_help(skb, protoff, ct, ctinfo, timeout); + return nf_conntrack_broadcast_help(skb, ct, ctinfo, timeout); } static struct nf_conntrack_helper helper __read_mostly = { diff --git a/net/netfilter/nf_conntrack_snmp.c b/net/netfilter/nf_conntrack_snmp.c index 87b95a2..2d0f8e01 100644 --- a/net/netfilter/nf_conntrack_snmp.c +++ b/net/netfilter/nf_conntrack_snmp.c @@ -36,11 +36,12 @@ int (*nf_nat_snmp_hook)(struct sk_buff *skb, EXPORT_SYMBOL_GPL(nf_nat_snmp_hook); static int snmp_conntrack_help(struct sk_buff *skb, unsigned int protoff, - struct nf_conn *ct, enum ip_conntrack_info ctinfo) + struct nf_conn *ct, + enum ip_conntrack_info ctinfo) { typeof(nf_nat_snmp_hook) nf_nat_snmp; - nf_conntrack_broadcast_help(skb, protoff, ct, ctinfo, timeout); + nf_conntrack_broadcast_help(skb, ct, ctinfo, timeout); nf_nat_snmp = rcu_dereference(nf_nat_snmp_hook); if (nf_nat_snmp && ct->status & IPS_NAT_MASK)