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

Commit c8c4d42a authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

ipv6: only generate one new serial number per fib mutation 



Cc: YOSHIFUJI Hideaki <hideaki@yoshifuji.org>
Cc: Martin Lau <kafai@fb.com>
Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 42b18706

net/ipv6/ip6_fib.c

+6 −6
Original line number Diff line number Diff line
@@ -417,14 +417,13 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) 
static struct fib6_node *fib6_add_1(struct fib6_node *root,

				     struct in6_addr *addr, int plen,

				     int offset, int allow_create,

				     int replace_required)

				     int replace_required, int sernum)

{

	struct fib6_node *fn, *in, *ln;

	struct fib6_node *pn = NULL;

	struct rt6key *key;

	int	bit;

	__be32	dir = 0;

	int	sernum = fib6_new_sernum();



	RT6_TRACE("fib6_add_1\n");
@@ -842,6 +841,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info, 
	int err = -ENOMEM;

	int allow_create = 1;

	int replace_required = 0;

	int sernum = fib6_new_sernum();



	if (info->nlh) {

		if (!(info->nlh->nlmsg_flags & NLM_F_CREATE))
@@ -854,7 +854,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info, 


	fn = fib6_add_1(root, &rt->rt6i_dst.addr, rt->rt6i_dst.plen,

			offsetof(struct rt6_info, rt6i_dst), allow_create,

			replace_required);

			replace_required, sernum);

	if (IS_ERR(fn)) {

		err = PTR_ERR(fn);

		fn = NULL;
@@ -888,14 +888,14 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info, 
			sfn->leaf = info->nl_net->ipv6.ip6_null_entry;

			atomic_inc(&info->nl_net->ipv6.ip6_null_entry->rt6i_ref);

			sfn->fn_flags = RTN_ROOT;

			sfn->fn_sernum = fib6_new_sernum();

			sfn->fn_sernum = sernum;



			/* Now add the first leaf node to new subtree */



			sn = fib6_add_1(sfn, &rt->rt6i_src.addr,

					rt->rt6i_src.plen,

					offsetof(struct rt6_info, rt6i_src),

					allow_create, replace_required);

					allow_create, replace_required, sernum);



			if (IS_ERR(sn)) {

				/* If it is failed, discard just allocated
@@ -914,7 +914,7 @@ int fib6_add(struct fib6_node *root, struct rt6_info *rt, struct nl_info *info, 
			sn = fib6_add_1(fn->subtree, &rt->rt6i_src.addr,

					rt->rt6i_src.plen,

					offsetof(struct rt6_info, rt6i_src),

					allow_create, replace_required);

					allow_create, replace_required, sernum);



			if (IS_ERR(sn)) {

				err = PTR_ERR(sn);