Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / net / ndisc.h

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index ce532f2222ce723daf21eaea7429bcbb5a26b4a8..1459ed3e2697b495bb37226c8190b7f81d428c3c 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -155,9 +155,9 @@ static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, const s
 {
 
        if (dev)
-               return __neigh_lookup(&nd_tbl, addr, dev, 1);
+               return __neigh_lookup_errno(&nd_tbl, addr, dev);
 
-       return NULL;
+       return ERR_PTR(-ENODEV);
 }