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

net: rename dst_neigh_output back to neigh_output

After the dst->pending_confirm flag was removed, we do not
need anymore to provide dst arg to dst_neigh_output.
So, rename it to neigh_output as before commit 5110effe
("net: Do delayed neigh confirmation.").
Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 90d2ea9f
...@@ -379,7 +379,7 @@ static int vrf_finish_output6(struct net *net, struct sock *sk, ...@@ -379,7 +379,7 @@ static int vrf_finish_output6(struct net *net, struct sock *sk,
neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false); neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false);
if (!IS_ERR(neigh)) { if (!IS_ERR(neigh)) {
sock_confirm_neigh(skb, neigh); sock_confirm_neigh(skb, neigh);
ret = dst_neigh_output(dst, neigh, skb); ret = neigh_output(neigh, skb);
rcu_read_unlock_bh(); rcu_read_unlock_bh();
return ret; return ret;
} }
...@@ -577,7 +577,7 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s ...@@ -577,7 +577,7 @@ static int vrf_finish_output(struct net *net, struct sock *sk, struct sk_buff *s
neigh = __neigh_create(&arp_tbl, &nexthop, dev, false); neigh = __neigh_create(&arp_tbl, &nexthop, dev, false);
if (!IS_ERR(neigh)) { if (!IS_ERR(neigh)) {
sock_confirm_neigh(skb, neigh); sock_confirm_neigh(skb, neigh);
ret = dst_neigh_output(dst, neigh, skb); ret = neigh_output(neigh, skb);
} }
rcu_read_unlock_bh(); rcu_read_unlock_bh();
......
...@@ -442,18 +442,6 @@ static inline void dst_confirm(struct dst_entry *dst) ...@@ -442,18 +442,6 @@ static inline void dst_confirm(struct dst_entry *dst)
{ {
} }
static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
struct sk_buff *skb)
{
const struct hh_cache *hh;
hh = &n->hh;
if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
return neigh_hh_output(hh, skb);
else
return n->output(n, skb);
}
static inline struct neighbour *dst_neigh_lookup(const struct dst_entry *dst, const void *daddr) static inline struct neighbour *dst_neigh_lookup(const struct dst_entry *dst, const void *daddr)
{ {
struct neighbour *n = dst->ops->neigh_lookup(dst, NULL, daddr); struct neighbour *n = dst->ops->neigh_lookup(dst, NULL, daddr);
......
...@@ -468,6 +468,16 @@ static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb ...@@ -468,6 +468,16 @@ static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb
return dev_queue_xmit(skb); return dev_queue_xmit(skb);
} }
static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
{
const struct hh_cache *hh = &n->hh;
if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
return neigh_hh_output(hh, skb);
else
return n->output(n, skb);
}
static inline struct neighbour * static inline struct neighbour *
__neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat) __neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat)
{ {
......
...@@ -225,7 +225,7 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s ...@@ -225,7 +225,7 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s
int res; int res;
sock_confirm_neigh(skb, neigh); sock_confirm_neigh(skb, neigh);
res = dst_neigh_output(dst, neigh, skb); res = neigh_output(neigh, skb);
rcu_read_unlock_bh(); rcu_read_unlock_bh();
return res; return res;
......
...@@ -120,7 +120,7 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff * ...@@ -120,7 +120,7 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *
neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false); neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false);
if (!IS_ERR(neigh)) { if (!IS_ERR(neigh)) {
sock_confirm_neigh(skb, neigh); sock_confirm_neigh(skb, neigh);
ret = dst_neigh_output(dst, neigh, skb); ret = neigh_output(neigh, skb);
rcu_read_unlock_bh(); rcu_read_unlock_bh();
return ret; return ret;
} }
......
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