summaryrefslogtreecommitdiff
path: root/include/net/neighbour.h
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2017-02-11 14:49:20 +0300
committerDavid S. Miller <davem@davemloft.net>2017-02-12 05:25:18 +0300
commitc16ec18599c8c1722d476011786fd9e2529888f7 (patch)
tree0f17b999b254b930081517f6bc64f12b911bff75 /include/net/neighbour.h
parent90d2ea9f66d3f9f96bc0f41d94b4830c0b2d0a50 (diff)
downloadlinux-c16ec18599c8c1722d476011786fd9e2529888f7.tar.xz
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/neighbour.h')
-rw-r--r--include/net/neighbour.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 8b683841e574..5ebf69491160 100644
--- 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)
{