hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: Add FIB table id to rtable 

Add the FIB table id to rtable to make the information available for
IPv4 as it is for IPv6.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern 2015-09-02 13:58:35 -07:00 committed by David S. Miller
parent d08c4f3554
commit b7503e0cdb
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/vrf.c
View File

@ -320,6 +320,7 @@ static void vrf_rtable_destroy(struct net_vrf *vrf)
static struct rtable *vrf_rtable_create(struct net_device *dev) static struct rtable *vrf_rtable_create(struct net_device *dev)
{ {
struct net_vrf *vrf = netdev_priv(dev);
struct rtable *rth; struct rtable *rth;
rth = dst_alloc(&vrf_dst_ops, dev, 2, rth = dst_alloc(&vrf_dst_ops, dev, 2,
@ -335,6 +336,7 @@ static struct rtable *vrf_rtable_create(struct net_device *dev)
rth->rt_pmtu = 0; rth->rt_pmtu = 0;
rth->rt_gateway = 0; rth->rt_gateway = 0;
rth->rt_uses_gateway = 0; rth->rt_uses_gateway = 0;
rth->rt_table_id = vrf->tb_id;
INIT_LIST_HEAD(&rth->rt_uncached); INIT_LIST_HEAD(&rth->rt_uncached);
rth->rt_uncached_list = NULL; rth->rt_uncached_list = NULL;
} }

2
include/net/route.h
View File

@ -64,6 +64,8 @@ struct rtable {
/* Miscellaneous cached information */ /* Miscellaneous cached information */
u32 rt_pmtu; u32 rt_pmtu;
u32 rt_table_id;
struct list_head rt_uncached; struct list_head rt_uncached;
struct uncached_list *rt_uncached_list; struct uncached_list *rt_uncached_list;
}; };

8
net/ipv4/route.c
View File

@ -1457,6 +1457,7 @@ static struct rtable *rt_dst_alloc(struct net_device *dev,
rt->rt_pmtu = 0; rt->rt_pmtu = 0;
rt->rt_gateway = 0; rt->rt_gateway = 0;
rt->rt_uses_gateway = 0; rt->rt_uses_gateway = 0;
rt->rt_table_id = 0;
INIT_LIST_HEAD(&rt->rt_uncached); INIT_LIST_HEAD(&rt->rt_uncached);
rt->dst.output = ip_output; rt->dst.output = ip_output;
@ -1629,6 +1630,8 @@ static int __mkroute_input(struct sk_buff *skb,
} }
rth->rt_is_input = 1; rth->rt_is_input = 1;
if (res->table)
rth->rt_table_id = res->table->tb_id;
RT_CACHE_STAT_INC(in_slow_tot); RT_CACHE_STAT_INC(in_slow_tot);
rth->dst.input = ip_forward; rth->dst.input = ip_forward;
@ -1808,6 +1811,8 @@ local_input:
rth->dst.tclassid = itag; rth->dst.tclassid = itag;
#endif #endif
rth->rt_is_input = 1; rth->rt_is_input = 1;
if (res.table)
rth->rt_table_id = res.table->tb_id;
RT_CACHE_STAT_INC(in_slow_tot); RT_CACHE_STAT_INC(in_slow_tot);
if (res.type == RTN_UNREACHABLE) { if (res.type == RTN_UNREACHABLE) {
@ -1988,6 +1993,9 @@ add:
return ERR_PTR(-ENOBUFS); return ERR_PTR(-ENOBUFS);
rth->rt_iif = orig_oif ? : 0; rth->rt_iif = orig_oif ? : 0;
if (res->table)
rth->rt_table_id = res->table->tb_id;
RT_CACHE_STAT_INC(out_slow_tot); RT_CACHE_STAT_INC(out_slow_tot);
if (flags & (RTCF_BROADCAST | RTCF_MULTICAST)) { if (flags & (RTCF_BROADCAST | RTCF_MULTICAST)) {

1
net/ipv4/xfrm4_policy.c
View File

@ -95,6 +95,7 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
xdst->u.rt.rt_gateway = rt->rt_gateway; xdst->u.rt.rt_gateway = rt->rt_gateway;
xdst->u.rt.rt_uses_gateway = rt->rt_uses_gateway; xdst->u.rt.rt_uses_gateway = rt->rt_uses_gateway;
xdst->u.rt.rt_pmtu = rt->rt_pmtu; xdst->u.rt.rt_pmtu = rt->rt_pmtu;
xdst->u.rt.rt_table_id = rt->rt_table_id;
INIT_LIST_HEAD(&xdst->u.rt.rt_uncached); INIT_LIST_HEAD(&xdst->u.rt.rt_uncached);
return 0; return 0;