From patchwork Tue Jul 17 12:06:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 10529219 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 25766600D0 for ; Tue, 17 Jul 2018 12:07:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 18A2828EAA for ; Tue, 17 Jul 2018 12:07:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0CB1528EB0; Tue, 17 Jul 2018 12:07:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B26EA28EAA for ; Tue, 17 Jul 2018 12:07:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731775AbeGQMjc (ORCPT ); Tue, 17 Jul 2018 08:39:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:60678 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731540AbeGQMjM (ORCPT ); Tue, 17 Jul 2018 08:39:12 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B41B82147A; Tue, 17 Jul 2018 12:06:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1531829212; bh=jYoNkLJ7QR4t/7uIahoReNyfAidBVd/c3Ctl8P9Uzww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NXw0KqdTchkDhkUDuzmERZ0dKcaYp6GSAFBXmYltHKQ/WHwRQZhhy7JBSdyNFBrU/ PmUw/ZzVktJuIxbAlxijatWjQgIrHt52CrYSj63Cb8FKoT8V98ksY90RH6cnlT4FGY 2+l0T/sbpbC9aro+YNJG5nM+WGTiLLUouPEpA09A= From: dsahern@kernel.org To: netdev@vger.kernel.org Cc: nikita.leshchenko@oracle.com, roopa@cumulusnetworks.com, stephen@networkplumber.org, idosch@mellanox.com, jiri@mellanox.com, saeedm@mellanox.com, alex.aring@gmail.com, linux-wpan@vger.kernel.org, netfilter-devel@vger.kernel.org, linux-kernel@vger.kernel.org, David Ahern Subject: [PATCH RFC/RFT net-next 17/17] net/neighbor: Remove neigh_tables and NEIGH enum Date: Tue, 17 Jul 2018 05:06:51 -0700 Message-Id: <20180717120651.15748-18-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180717120651.15748-1-dsahern@kernel.org> References: <20180717120651.15748-1-dsahern@kernel.org> Sender: linux-wpan-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wpan@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Ahern No longer used. Signed-off-by: David Ahern --- include/net/neighbour.h | 8 -------- net/core/neighbour.c | 2 -- 2 files changed, 10 deletions(-) diff --git a/include/net/neighbour.h b/include/net/neighbour.h index e968db1b7742..72002a24e72e 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -222,14 +222,6 @@ struct neigh_table { struct pneigh_entry **phash_buckets; }; -enum { - NEIGH_ARP_TABLE = 0, - NEIGH_ND_TABLE = 1, - NEIGH_DN_TABLE = 2, - NEIGH_NR_TABLES, - NEIGH_LINK_TABLE = NEIGH_NR_TABLES /* Pseudo table for neigh_xmit */ -}; - struct neigh_table *neigh_find_table(struct net *net, u8 family); static inline int neigh_parms_family(struct neigh_parms *p) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 1bb7fa14cb62..7c3d4cb811d3 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1559,8 +1559,6 @@ static void neigh_parms_destroy(struct neigh_parms *parms) static struct lock_class_key neigh_table_proxy_queue_class; -static struct neigh_table *neigh_tables[NEIGH_NR_TABLES] __read_mostly; - void neigh_table_init(struct net *net, struct neigh_table *tbl) { unsigned long now = jiffies;