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

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

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index bd8f9f09ab5c648038cb9f3f82239bbd76c81793..337da241a80f9d70257672261fd0eff6a75d3ac1 100644 (file)
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -344,6 +344,15 @@ static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
        return hh->hh_output(skb);
 }
 
+static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
+{
+       struct hh_cache *hh = &n->hh;
+       if (hh->hh_len)
+               return neigh_hh_output(hh, skb);
+       else
+               return n->output(skb);
+}
+
 static inline struct neighbour *
 __neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat)
 {

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 1ac674a68c770166ddf21b19a09b73582ae317b9..db296a98b236bcbeec7a7d938e3a537b4bab7683 100644 (file)
--- 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 36362e9513f012d1ca975823fdb5c19bcf927ed6..eb50bb07ab2ec0aec2710470d023bdf7ac8badc0 100644 (file)
--- 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);