Skip to content

Commit 95b3120

Browse files
q2venkuba-moo
authored andcommitted
neighbour: Remove NEIGH_DN_TABLE.
Since commit 1202cdd ("Remove DECnet support from kernel"), NEIGH_DN_TABLE is no longer used. MPLS has implicit dependency on it in nla_put_via(), but nla_get_via() does not support DECnet. Let's remove NEIGH_DN_TABLE. Now, neigh_tables[] has only 2 elements and no extra iteration for DECnet in many places. Signed-off-by: Kuniyuki Iwashima <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 068f3b3 commit 95b3120

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

include/net/neighbour.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ struct neigh_table {
239239
enum {
240240
NEIGH_ARP_TABLE = 0,
241241
NEIGH_ND_TABLE = 1,
242-
NEIGH_DN_TABLE = 2,
243242
NEIGH_NR_TABLES,
244243
NEIGH_LINK_TABLE = NEIGH_NR_TABLES /* Pseudo table for neigh_xmit */
245244
};

net/mpls/af_mpls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1664,7 +1664,7 @@ static int nla_put_via(struct sk_buff *skb,
16641664
u8 table, const void *addr, int alen)
16651665
{
16661666
static const int table_to_family[NEIGH_NR_TABLES + 1] = {
1667-
AF_INET, AF_INET6, AF_DECnet, AF_PACKET,
1667+
AF_INET, AF_INET6, AF_PACKET,
16681668
};
16691669
struct nlattr *nla;
16701670
struct rtvia *via;

0 commit comments

Comments
 (0)