net: Remove fib_local variable
authorDavid Ahern <dsa@cumulusnetworks.com>
Tue, 9 Aug 2016 13:51:06 +0000 (06:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Aug 2016 21:57:39 +0000 (14:57 -0700)
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>
include/net/netns/ipv4.h
net/ipv4/fib_frontend.c

index d061ffeb1e71204c490abed907004804036030e0..7adf4386ac8fa644cf41198ef028c369dcbe02e0 100644 (file)
@@ -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
index ef2ebeb89d0fb0cb9cb5da4aea13183097baec8c..317c31939732d81623602ce066c6049ff1693560 100644 (file)
@@ -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