Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 631fee7d authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

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: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb8082f6

include/net/netns/ipv4.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct netns_ipv4 { 
#ifdef CONFIG_IP_MULTIPLE_TABLES

	struct fib_rules_ops	*rules_ops;

	bool			fib_has_custom_rules;

	struct fib_table __rcu	*fib_local;

	struct fib_table __rcu	*fib_main;

	struct fib_table __rcu	*fib_default;

#endif

net/ipv4/fib_frontend.c

+0 −7
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ struct fib_table *fib_new_table(struct net *net, u32 id) 
		return NULL;



	switch (id) {

	case RT_TABLE_LOCAL:

		rcu_assign_pointer(net->ipv4.fib_local, tb);

		break;

	case RT_TABLE_MAIN:

		rcu_assign_pointer(net->ipv4.fib_main, tb);

		break;
@@ -137,9 +134,6 @@ static void fib_replace_table(struct net *net, struct fib_table *old, 
{

#ifdef CONFIG_IP_MULTIPLE_TABLES

	switch (new->tb_id) {

	case RT_TABLE_LOCAL:

		rcu_assign_pointer(net->ipv4.fib_local, new);

		break;

	case RT_TABLE_MAIN:

		rcu_assign_pointer(net->ipv4.fib_main, new);

		break;
@@ -1249,7 +1243,6 @@ static void ip_fib_net_exit(struct net *net) 


	rtnl_lock();

#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_default, NULL);

#endif