Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: Remove fib_local variable

After commit 0ddcf43d5d4a ("ipv4: FIB Local/MAIN table collapse")
fib_local is set but not used. Remove it.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

David Ahern and committed by
David S. Miller
631fee7d bb8082f6

-8
-1
include/net/netns/ipv4.h
··· 40 40 #ifdef CONFIG_IP_MULTIPLE_TABLES 41 41 struct fib_rules_ops *rules_ops; 42 42 bool fib_has_custom_rules; 43 - struct fib_table __rcu *fib_local; 44 43 struct fib_table __rcu *fib_main; 45 44 struct fib_table __rcu *fib_default; 46 45 #endif
-7
net/ipv4/fib_frontend.c
··· 93 93 return NULL; 94 94 95 95 switch (id) { 96 - case RT_TABLE_LOCAL: 97 - rcu_assign_pointer(net->ipv4.fib_local, tb); 98 - break; 99 96 case RT_TABLE_MAIN: 100 97 rcu_assign_pointer(net->ipv4.fib_main, tb); 101 98 break; ··· 134 137 { 135 138 #ifdef CONFIG_IP_MULTIPLE_TABLES 136 139 switch (new->tb_id) { 137 - case RT_TABLE_LOCAL: 138 - rcu_assign_pointer(net->ipv4.fib_local, new); 139 - break; 140 140 case RT_TABLE_MAIN: 141 141 rcu_assign_pointer(net->ipv4.fib_main, new); 142 142 break; ··· 1243 1249 1244 1250 rtnl_lock(); 1245 1251 #ifdef CONFIG_IP_MULTIPLE_TABLES 1246 - RCU_INIT_POINTER(net->ipv4.fib_local, NULL); 1247 1252 RCU_INIT_POINTER(net->ipv4.fib_main, NULL); 1248 1253 RCU_INIT_POINTER(net->ipv4.fib_default, NULL); 1249 1254 #endif