neigh: Kill hh_cache->hh_output

It's just taking on one of two possible values, either
neigh_ops->output or dev_queue_xmit().  And this is purely depending
upon whether nud_state has NUD_CONNECTED set or not.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f84dfd25c43..52c4e3835aa 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -254,7 +254,6 @@ struct netdev_hw_addr_list {
 struct hh_cache {
         u16             hh_len;
         u16             __pad;
-        int             (*hh_output)(struct sk_buff *skb);
         seqlock_t       hh_lock;
 
         /* cached hardware header; allow for machine alignment needs.        */
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 97990ddca66..60bac8112d8 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -340,13 +340,13 @@ static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
         } while (read_seqretry(&hh->hh_lock, seq));
 
         skb_push(skb, hh_len);
-        return hh->hh_output(skb);
+        return dev_queue_xmit(skb);
 }
 
 static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
 {
         struct hh_cache *hh = &n->hh;
-        if (hh->hh_len)
+        if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
                 return neigh_hh_output(hh, skb);
         else
                 return n->output(skb);