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

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 630eafdb79e85bf84b1fe3c53dff2af5c968df17..22379da63400776ff70994097de6d472232ca908 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -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();

diff --git a/include/net/dst.h b/include/net/dst.h
index 84a1043dd6a10b5cdbef744fed38a3b9a7b170b2..049af33da3b6c95897d544670cea65c542317673 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -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);

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 8b683841e5743f011a0d362af4ea9c26d0e75c77..5ebf6949116097f60e668b0c2c4c48dd1639e5e8 100644 (file)
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -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)
 {

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 7a719f1ae55685346573c5ffe33cd1a8764f6422..737ce826d7ecfa040d07d7f8e8d6dedd01ca7330 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -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;

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d299040613a036895081e4aab2bc7b42f67e823d..a75871c623286d3b923b76887758327ced8baedb 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -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;
        }