4 files changed, 7 insertions, 29 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index f84dfd25c431..52c4e3835aa6 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 97990ddca66c..60bac8112d86 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);
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index c22def5ae486..2feda6e7a31d 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -720,15 +720,9 @@ EXPORT_SYMBOL(neigh_destroy);
  */
 static void neigh_suspect(struct neighbour *neigh)
 {
-        struct hh_cache *hh;
-
         NEIGH_PRINTK2("neigh %p is suspected.\n", neigh);
 
         neigh->output = neigh->ops->output;
-
-        hh = &neigh->hh;
-        if (hh->hh_len)
-                hh->hh_output = neigh->ops->output;
 }
 
 /* Neighbour state is OK;
@@ -738,15 +732,9 @@ static void neigh_suspect(struct neighbour *neigh)
  */
 static void neigh_connect(struct neighbour *neigh)
 {
-        struct hh_cache *hh;
-
         NEIGH_PRINTK2("neigh %p is connected.\n", neigh);
 
         neigh->output = neigh->ops->connected_output;
-
-        hh = &neigh->hh;
-        if (hh->hh_len)
-                hh->hh_output = dev_queue_xmit;
 }
 
 static void neigh_periodic_work(struct work_struct *work)
@@ -1215,18 +1203,9 @@ static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst)
         /* Only one thread can come in here and initialize the
          * hh_cache entry.
          */
-        if (hh->hh_len)
-                goto end;
-
-        if (dev->header_ops->cache(n, hh, prot))
-                goto end;
-
-        if (n->nud_state & NUD_CONNECTED)
-                hh->hh_output = dev_queue_xmit;
-        else
-                hh->hh_output = n->ops->output;
+        if (!hh->hh_len)
+                dev->header_ops->cache(n, hh, prot);
 
-end:
         write_unlock_bh(&n->lock);
 }
 
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index a52bb74d2612..bcf9bb508200 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -427,9 +427,9 @@ static int rt_cache_seq_show(struct seq_file *seq, void *v)
                               dst_metric(&r->dst, RTAX_RTTVAR)),
                         r->rt_key_tos,
                         -1,
-                        (r->dst.neighbour ?
-                         (r->dst.neighbour->hh.hh_output ==
-                          dev_queue_xmit) : 0),
+                        (r->dst.neighbour &&
+                         (r->dst.neighbour->nud_state & NUD_CONNECTED)) ?
+                           1 : 0,
                         r->rt_spec_dst, &len);
 
                 seq_printf(seq, "%*s\n", 127 - len, "");