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

Commit 51ce8bd4 authored by Julian Anastasov's avatar Julian Anastasov Committed by David S. Miller
Browse files

net: pending_confirm is not used anymore 



When same struct dst_entry can be used for many different
neighbours we can not use it for pending confirmations.
As last step, we can remove the pending_confirm flag.

Reported-by: default avatarYueHaibing <yuehaibing@huawei.com>
Fixes: 5110effe ("net: Do delayed neigh confirmation.")
Fixes: f2bb4bed ("ipv4: Cache output routes in fib_info nexthops.")
Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0dec879f

include/net/dst.h

+2 −12
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ struct dst_entry { 
#define DST_XFRM_QUEUE		0x0100

#define DST_METADATA		0x0200



	unsigned short		pending_confirm;



	short			error;



	/* A non-zero value of dst->obsolete forces by-hand validation
@@ -78,6 +76,8 @@ struct dst_entry { 
#define DST_OBSOLETE_KILL	-2

	unsigned short		header_len;	/* more space at head required */

	unsigned short		trailer_len;	/* space to reserve at tail */

	unsigned short		__pad3;



#ifdef CONFIG_IP_ROUTE_CLASSID

	__u32			tclassid;

#else
@@ -440,7 +440,6 @@ static inline void dst_rcu_free(struct rcu_head *head) 


static inline void dst_confirm(struct dst_entry *dst)

{

	dst->pending_confirm = 1;

}



static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
@@ -448,15 +447,6 @@ static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n, 
{

	const struct hh_cache *hh;



	if (dst->pending_confirm) {

		unsigned long now = jiffies;



		dst->pending_confirm = 0;

		/* avoid dirtying neighbour */

		if (n->confirmed != now)

			n->confirmed = now;

	}



	hh = &n->hh;

	if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)

		return neigh_hh_output(hh, skb);

net/core/dst.c

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops, 
	dst->__use = 0;

	dst->lastuse = jiffies;

	dst->flags = flags;

	dst->pending_confirm = 0;

	dst->next = NULL;

	if (!(flags & DST_NOCOUNT))

		dst_entries_add(ops, 1);