net: Abstract dst->neighbour accesses behind helpers.

[deliverable/linux.git] / net / ipv4 / ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index a621b96aed157c57dc92112f849b1ed910c837f9..be27e609a98b27a82e89b845fbd120808a1622b2 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -204,14 +204,10 @@ static inline int ip_finish_output2(struct sk_buff *skb)
                skb = skb2;
        }
 
-       neigh = dst->neighbour;
-       if (neigh) {
-               struct hh_cache *hh = &neigh->hh;
-               if (hh->hh_len)
-                       return neigh_hh_output(hh, skb);
-               else
-                       return dst->neighbour->output(skb);
-       }
+       neigh = dst_get_neighbour(dst);
+       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);