Skip to content

Commit 631fee7

Browse files
David Aherndavem330
David Ahern
authored andcommitted
net: Remove fib_local variable
After commit 0ddcf43 ("ipv4: FIB Local/MAIN table collapse") fib_local is set but not used. Remove it. Signed-off-by: David Ahern <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent bb8082f commit 631fee7

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

include/net/netns/ipv4.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ struct netns_ipv4 {
4040
#ifdef CONFIG_IP_MULTIPLE_TABLES
4141
struct fib_rules_ops *rules_ops;
4242
bool fib_has_custom_rules;
43-
struct fib_table __rcu *fib_local;
4443
struct fib_table __rcu *fib_main;
4544
struct fib_table __rcu *fib_default;
4645
#endif

net/ipv4/fib_frontend.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ struct fib_table *fib_new_table(struct net *net, u32 id)
9393
return NULL;
9494

9595
switch (id) {
96-
case RT_TABLE_LOCAL:
97-
rcu_assign_pointer(net->ipv4.fib_local, tb);
98-
break;
9996
case RT_TABLE_MAIN:
10097
rcu_assign_pointer(net->ipv4.fib_main, tb);
10198
break;
@@ -137,9 +134,6 @@ static void fib_replace_table(struct net *net, struct fib_table *old,
137134
{
138135
#ifdef CONFIG_IP_MULTIPLE_TABLES
139136
switch (new->tb_id) {
140-
case RT_TABLE_LOCAL:
141-
rcu_assign_pointer(net->ipv4.fib_local, new);
142-
break;
143137
case RT_TABLE_MAIN:
144138
rcu_assign_pointer(net->ipv4.fib_main, new);
145139
break;
@@ -1249,7 +1243,6 @@ static void ip_fib_net_exit(struct net *net)
12491243

12501244
rtnl_lock();
12511245
#ifdef CONFIG_IP_MULTIPLE_TABLES
1252-
RCU_INIT_POINTER(net->ipv4.fib_local, NULL);
12531246
RCU_INIT_POINTER(net->ipv4.fib_main, NULL);
12541247
RCU_INIT_POINTER(net->ipv4.fib_default, NULL);
12551248
#endif

0 commit comments

Comments
 (0)