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

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

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

drivers/net/vrf.c

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ static void vrf_rtable_destroy(struct net_vrf *vrf) 


static struct rtable *vrf_rtable_create(struct net_device *dev)

{

	struct net_vrf *vrf = netdev_priv(dev);

	struct rtable *rth;



	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_gateway	= 0;

		rth->rt_uses_gateway = 0;

		rth->rt_table_id = vrf->tb_id;

		INIT_LIST_HEAD(&rth->rt_uncached);

		rth->rt_uncached_list = NULL;

	}

include/net/route.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ struct rtable { 
	/* Miscellaneous cached information */

	u32			rt_pmtu;



	u32			rt_table_id;



	struct list_head	rt_uncached;

	struct uncached_list	*rt_uncached_list;

};

net/ipv4/route.c

+8 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,7 @@ static struct rtable *rt_dst_alloc(struct net_device *dev, 
		rt->rt_pmtu = 0;

		rt->rt_gateway = 0;

		rt->rt_uses_gateway = 0;

		rt->rt_table_id = 0;

		INIT_LIST_HEAD(&rt->rt_uncached);



		rt->dst.output = ip_output;
@@ -1629,6 +1630,8 @@ static int __mkroute_input(struct sk_buff *skb, 
	}



	rth->rt_is_input = 1;

	if (res->table)

		rth->rt_table_id = res->table->tb_id;

	RT_CACHE_STAT_INC(in_slow_tot);



	rth->dst.input = ip_forward;
@@ -1808,6 +1811,8 @@ out: return err; 
	rth->dst.tclassid = itag;

#endif

	rth->rt_is_input = 1;

	if (res.table)

		rth->rt_table_id = res.table->tb_id;



	RT_CACHE_STAT_INC(in_slow_tot);

	if (res.type == RTN_UNREACHABLE) {
@@ -1988,6 +1993,9 @@ static struct rtable *__mkroute_output(const struct fib_result *res, 
		return ERR_PTR(-ENOBUFS);



	rth->rt_iif	= orig_oif ? : 0;

	if (res->table)

		rth->rt_table_id = res->table->tb_id;



	RT_CACHE_STAT_INC(out_slow_tot);



	if (flags & (RTCF_BROADCAST | RTCF_MULTICAST)) {

net/ipv4/xfrm4_policy.c

+1 −0
Original line number Diff line number Diff line
@@ -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_uses_gateway = rt->rt_uses_gateway;

	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);



	return 0;