redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

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 5110effee8
("net: Do delayed neigh confirmation.").

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
zero-colors
Julian Anastasov 2017-02-11 13:49:20 +02:00 committed by David S. Miller
parent 90d2ea9f66
commit c16ec18599
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/vrf.c
View File

@ -379,7 +379,7 @@ static int vrf_finish_output6(struct net *net, struct sock *sk,
neigh = __neigh_create(&nd_tbl, nexthop, dst->dev, false);
if (!IS_ERR(neigh)) {
sock_confirm_neigh(skb, neigh);
ret = dst_neigh_output(dst, neigh, skb);
ret = neigh_output(neigh, skb);
rcu_read_unlock_bh();
return ret;
}
@ -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);
if (!IS_ERR(neigh)) {
sock_confirm_neigh(skb, neigh);
ret = dst_neigh_output(dst, neigh, skb);
ret = neigh_output(neigh, skb);
}
rcu_read_unlock_bh();

12
include/net/dst.h
View File

@ -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)
{
struct neighbour *n = dst->ops->neigh_lookup(dst, NULL, daddr);

10
include/net/neighbour.h
View File

@ -468,6 +468,16 @@ static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *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 *
__neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat)
{

2
net/ipv4/ip_output.c
View File

@ -225,7 +225,7 @@ static int ip_finish_output2(struct net *net, struct sock *sk, struct sk_buff *s
int res;
sock_confirm_neigh(skb, neigh);
res = dst_neigh_output(dst, neigh, skb);
res = neigh_output(neigh, skb);
rcu_read_unlock_bh();
return res;

2
net/ipv6/ip6_output.c
View File

@ -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);
if (!IS_ERR(neigh)) {
sock_confirm_neigh(skb, neigh);
ret = dst_neigh_output(dst, neigh, skb);
ret = neigh_output(neigh, skb);
rcu_read_unlock_bh();
return ret;
}