Commit 74109218 authored by Wei Wang's avatar Wei Wang Committed by David S. Miller
Browse files

ipv6: initialize rt6->rt6i_uncached in all pre-allocated dst entries 



Initialize rt6->rt6i_uncached on the following pre-allocated dsts:
net->ipv6.ip6_null_entry
net->ipv6.ip6_prohibit_entry
net->ipv6.ip6_blk_hole_entry

This is a preparation patch for later commits to be able to distinguish
dst entries in uncached list by doing:
!list_empty(rt6->rt6i_uncached)

Signed-off-by: default avatarWei Wang <weiwan@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarMahesh Bandewar <maheshb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0e09edcc

net/ipv6/route.c

+3 −0
Original line number Diff line number Diff line
@@ -6016,6 +6016,7 @@ static int __net_init ip6_route_net_init(struct net *net) 
	net->ipv6.ip6_null_entry->dst.ops = &net->ipv6.ip6_dst_ops;

	dst_init_metrics(&net->ipv6.ip6_null_entry->dst,

			 ip6_template_metrics, true);

	INIT_LIST_HEAD(&net->ipv6.ip6_null_entry->rt6i_uncached);



#ifdef CONFIG_IPV6_MULTIPLE_TABLES

	net->ipv6.fib6_has_custom_rules = false;
@@ -6027,6 +6028,7 @@ static int __net_init ip6_route_net_init(struct net *net) 
	net->ipv6.ip6_prohibit_entry->dst.ops = &net->ipv6.ip6_dst_ops;

	dst_init_metrics(&net->ipv6.ip6_prohibit_entry->dst,

			 ip6_template_metrics, true);

	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);



	net->ipv6.ip6_blk_hole_entry = kmemdup(&ip6_blk_hole_entry_template,

					       sizeof(*net->ipv6.ip6_blk_hole_entry),
@@ -6036,6 +6038,7 @@ static int __net_init ip6_route_net_init(struct net *net) 
	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;

	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,

			 ip6_template_metrics, true);

	INIT_LIST_HEAD(&net->ipv6.ip6_blk_hole_entry->rt6i_uncached);

#endif



	net->ipv6.sysctl.flush_delay = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE