From patchwork Tue Sep 6 14:35:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liping Zhang X-Patchwork-Id: 666624 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sT8Lt1PWmz9sCg for ; Wed, 7 Sep 2016 00:37:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=bnHoPvHr; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934030AbcIFOhA (ORCPT ); Tue, 6 Sep 2016 10:37:00 -0400 Received: from m12-14.163.com ([220.181.12.14]:51818 "EHLO m12-14.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933689AbcIFOg6 (ORCPT ); Tue, 6 Sep 2016 10:36:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=VCK7P5XqnNLzvYzRUN MbWrMzf8jzd+B/7uObMV+JAq4=; b=bnHoPvHrU9brXs/PiYTXBXYAphN7Q/GpLJ i4XcFJTO5L3FGY5kcuKJDV+RCb9AYAo134n7PKj7IxRlhE2QAoW9NF20PyVnYpLl KucLZCilNPjxgZgvntm1evMqP7tXcjlC25x6WxwKxAnQXODZoG0Sts2B/f6y+E6l 84/P4CDu0= Received: from MiWiFi-R2D-srv.localdomain (unknown [180.170.252.41]) by smtp10 (Coremail) with SMTP id DsCowAB3hdRo1M5XHH0ABQ--.25973S2; Tue, 06 Sep 2016 22:36:45 +0800 (CST) From: Liping Zhang To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Liping Zhang Subject: [PATCH nf-next] netfilter: nf_conntrack: remove unused ctl_table_path member in nf_conntrack_l3proto Date: Tue, 6 Sep 2016 22:35:47 +0800 Message-Id: <1473172547-8585-1-git-send-email-zlpnobody@163.com> X-Mailer: git-send-email 2.5.5 X-CM-TRANSID: DsCowAB3hdRo1M5XHH0ABQ--.25973S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Gw1DGrWxJw13AFykWF45KFg_yoWfArX_A3 9aqFW8WF45Gr92yr4kJFsrAa4DW3yxJFZagryavrWDta4ktr4v9rWkXF4Fv3y5GwsrCF17 XF95Gr1qyw47GjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU09vttUUUUU== X-Originating-IP: [180.170.252.41] X-CM-SenderInfo: x2os00perg5qqrwthudrp/1tbiDh3cl1Xlgp0DSwAAs- Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Liping Zhang After commit adf0516845bc ("netfilter: remove ip_conntrack* sysctl compat code"), ctl_table_path member in struct nf_conntrack_l3proto{} is not used anymore, remove it. Signed-off-by: Liping Zhang --- include/net/netfilter/nf_conntrack_l3proto.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h index cdc920b..8992e42 100644 --- a/include/net/netfilter/nf_conntrack_l3proto.h +++ b/include/net/netfilter/nf_conntrack_l3proto.h @@ -63,10 +63,6 @@ struct nf_conntrack_l3proto { size_t nla_size; -#ifdef CONFIG_SYSCTL - const char *ctl_table_path; -#endif /* CONFIG_SYSCTL */ - /* Init l3proto pernet data */ int (*init_net)(struct net *net);