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

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
...@@ -59,8 +59,6 @@ struct dst_entry { ...@@ -59,8 +59,6 @@ struct dst_entry {
#define DST_XFRM_QUEUE 0x0100 #define DST_XFRM_QUEUE 0x0100
#define DST_METADATA 0x0200 #define DST_METADATA 0x0200
unsigned short pending_confirm;
short error; short error;
/* A non-zero value of dst->obsolete forces by-hand validation /* A non-zero value of dst->obsolete forces by-hand validation
...@@ -78,6 +76,8 @@ struct dst_entry { ...@@ -78,6 +76,8 @@ struct dst_entry {
#define DST_OBSOLETE_KILL -2 #define DST_OBSOLETE_KILL -2
unsigned short header_len; /* more space at head required */ unsigned short header_len; /* more space at head required */
unsigned short trailer_len; /* space to reserve at tail */ unsigned short trailer_len; /* space to reserve at tail */
unsigned short __pad3;
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
__u32 tclassid; __u32 tclassid;
#else #else
...@@ -440,7 +440,6 @@ static inline void dst_rcu_free(struct rcu_head *head) ...@@ -440,7 +440,6 @@ static inline void dst_rcu_free(struct rcu_head *head)
static inline void dst_confirm(struct dst_entry *dst) 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, 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, ...@@ -448,15 +447,6 @@ static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
{ {
const struct hh_cache *hh; 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; hh = &n->hh;
if ((n->nud_state & NUD_CONNECTED) && hh->hh_len) if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
return neigh_hh_output(hh, skb); return neigh_hh_output(hh, skb);
......
...@@ -190,7 +190,6 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops, ...@@ -190,7 +190,6 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops,
dst->__use = 0; dst->__use = 0;
dst->lastuse = jiffies; dst->lastuse = jiffies;
dst->flags = flags; dst->flags = flags;
dst->pending_confirm = 0;
dst->next = NULL; dst->next = NULL;
if (!(flags & DST_NOCOUNT)) if (!(flags & DST_NOCOUNT))
dst_entries_add(ops, 1); dst_entries_add(ops, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment