diff options
| author | Kuniyuki Iwashima <kuniyu@amazon.com> | 2024-10-14 16:52:16 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-10-15 17:46:30 -0700 |
| commit | 95b3120a485f77a9bb8060bf3398311e3dcb6c65 (patch) | |
| tree | 7d90905df50a5e90eb53cb4c6341581e055e8e2c | |
| parent | 068f3b34c5c2be5fe7923a9966c1c16f992a2f9c (diff) | |
| download | linux-95b3120a485f77a9bb8060bf3398311e3dcb6c65.tar.gz linux-95b3120a485f77a9bb8060bf3398311e3dcb6c65.tar.bz2 linux-95b3120a485f77a9bb8060bf3398311e3dcb6c65.zip | |
neighbour: Remove NEIGH_DN_TABLE.
Since commit 1202cdd66531 ("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 <kuniyu@amazon.com>
Link: https://patch.msgid.link/20241014235216.10785-1-kuniyu@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | include/net/neighbour.h | 1 | ||||
| -rw-r--r-- | net/mpls/af_mpls.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index a44f262a7384..3887ed9e5026 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -239,7 +239,6 @@ struct neigh_table { 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 */ }; diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index df62638b6498..a0573847bc55 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -1664,7 +1664,7 @@ static int nla_put_via(struct sk_buff *skb, u8 table, const void *addr, int alen) { static const int table_to_family[NEIGH_NR_TABLES + 1] = { - AF_INET, AF_INET6, AF_DECnet, AF_PACKET, + AF_INET, AF_INET6, AF_PACKET, }; struct nlattr *nla; struct rtvia *via; |