提交 631fee7d 编写于 作者: D David Ahern 提交者: David S. Miller

net: Remove fib_local variable

After commit 0ddcf43d ("ipv4: FIB Local/MAIN table collapse")
fib_local is set but not used. Remove it.
Signed-off-by: NDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 bb8082f6
...@@ -40,7 +40,6 @@ struct netns_ipv4 { ...@@ -40,7 +40,6 @@ struct netns_ipv4 {
#ifdef CONFIG_IP_MULTIPLE_TABLES #ifdef CONFIG_IP_MULTIPLE_TABLES
struct fib_rules_ops *rules_ops; struct fib_rules_ops *rules_ops;
bool fib_has_custom_rules; bool fib_has_custom_rules;
struct fib_table __rcu *fib_local;
struct fib_table __rcu *fib_main; struct fib_table __rcu *fib_main;
struct fib_table __rcu *fib_default; struct fib_table __rcu *fib_default;
#endif #endif
......
...@@ -93,9 +93,6 @@ struct fib_table *fib_new_table(struct net *net, u32 id) ...@@ -93,9 +93,6 @@ struct fib_table *fib_new_table(struct net *net, u32 id)
return NULL; return NULL;
switch (id) { switch (id) {
case RT_TABLE_LOCAL:
rcu_assign_pointer(net->ipv4.fib_local, tb);
break;
case RT_TABLE_MAIN: case RT_TABLE_MAIN:
rcu_assign_pointer(net->ipv4.fib_main, tb); rcu_assign_pointer(net->ipv4.fib_main, tb);
break; break;
...@@ -137,9 +134,6 @@ static void fib_replace_table(struct net *net, struct fib_table *old, ...@@ -137,9 +134,6 @@ static void fib_replace_table(struct net *net, struct fib_table *old,
{ {
#ifdef CONFIG_IP_MULTIPLE_TABLES #ifdef CONFIG_IP_MULTIPLE_TABLES
switch (new->tb_id) { switch (new->tb_id) {
case RT_TABLE_LOCAL:
rcu_assign_pointer(net->ipv4.fib_local, new);
break;
case RT_TABLE_MAIN: case RT_TABLE_MAIN:
rcu_assign_pointer(net->ipv4.fib_main, new); rcu_assign_pointer(net->ipv4.fib_main, new);
break; break;
...@@ -1249,7 +1243,6 @@ static void ip_fib_net_exit(struct net *net) ...@@ -1249,7 +1243,6 @@ static void ip_fib_net_exit(struct net *net)
rtnl_lock(); rtnl_lock();
#ifdef CONFIG_IP_MULTIPLE_TABLES #ifdef CONFIG_IP_MULTIPLE_TABLES
RCU_INIT_POINTER(net->ipv4.fib_local, NULL);
RCU_INIT_POINTER(net->ipv4.fib_main, NULL); RCU_INIT_POINTER(net->ipv4.fib_main, NULL);
RCU_INIT_POINTER(net->ipv4.fib_default, NULL); RCU_INIT_POINTER(net->ipv4.fib_default, NULL);
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册