summaryrefslogtreecommitdiff
path: root/include/net/dst.h
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2017-02-11 13:49:20 +0200
committerDavid S. Miller <davem@davemloft.net>2017-02-11 21:25:18 -0500
commitc16ec18599c8c1722d476011786fd9e2529888f7 (patch)
tree0f17b999b254b930081517f6bc64f12b911bff75 /include/net/dst.h
parent90d2ea9f66d3f9f96bc0f41d94b4830c0b2d0a50 (diff)
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>
Diffstat (limited to 'include/net/dst.h')
-rw-r--r--include/net/dst.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index 84a1043dd6a1..049af33da3b6 100644
--- 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);