From 096bada1e8ac7f4e9e671ccaf833ea7ca390987b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 16 Jul 2011 17:26:00 -0700
Subject: [PATCH] --- yaml --- r: 256485 b: refs/heads/master c:
 05e3aa0949c138803185f92bd7db9be59cfca1be h: refs/heads/master i:   256483:
 b7e09087a157b8887fae0015f67906dfd8c2dc7c v: v3

---
 [refs]                        |  2 +-
 trunk/include/net/neighbour.h |  9 +++++++++
 trunk/net/ipv4/ip_output.c    | 10 +++-------
 trunk/net/ipv6/ip6_output.c   | 10 +++-------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 3550de4d0986..21d56bed0f86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a29282972cc9b80126d4e4d68251c6712bdad051
+refs/heads/master: 05e3aa0949c138803185f92bd7db9be59cfca1be
diff --git a/trunk/include/net/neighbour.h b/trunk/include/net/neighbour.h
index bd8f9f09ab5c..337da241a80f 100644
--- a/trunk/include/net/neighbour.h
+++ b/trunk/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/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index 1ac674a68c77..db296a98b236 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/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/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index 36362e9513f0..eb50bb07ab2e 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/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);