net: Create and use new helper, neigh_output().

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

2 files changed, 6 insertions, 14 deletions

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 1ac674a68c7..db296a98b23 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -205,13 +205,9 @@ static inline int ip_finish_output2(struct sk_buff *skb)
         }
 
         neigh = dst->neighbour;
-        if (neigh) {
-                struct hh_cache *hh = &neigh->hh;
-                if (hh->hh_len)
-                        return neigh_hh_output(hh, skb);
-                else
-                        return neigh->output(skb);
-        }
+        if (neigh)
+                return neigh_output(neigh, skb);
+
         if (net_ratelimit())
                 printk(KERN_DEBUG "ip_finish_output2: No header cache and no neighbour!\n");
         kfree_skb(skb);
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 36362e9513f..eb50bb07ab2 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -136,13 +136,9 @@ static int ip6_finish_output2(struct sk_buff *skb)
         }
 
         neigh = dst->neighbour;
-        if (neigh) {
-                struct hh_cache *hh = &neigh->hh;
-                if (hh->hh_len)
-                        return neigh_hh_output(hh, skb);
-                else
-                        return neigh->output(skb);
-        }
+        if (neigh)
+                return neigh_output(neigh, skb);
+
         IP6_INC_STATS_BH(dev_net(dst->dev),
                          ip6_dst_idev(dst), IPSTATS_MIB_OUTNOROUTES);
         kfree_skb(skb);