Merge branch 'cputime' of git://git390.marist.edu/pub/scm/linux-2.6

[~andy/linux] / include / net / ndisc.h

diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index ce532f2222ce723daf21eaea7429bcbb5a26b4a8..f76f22d057216bb3e28b68a3e68fd4c002e50b30 100644 (file)
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -55,7 +55,6 @@ enum {
 #include <net/neighbour.h>
 
 struct ctl_table;
-struct file;
 struct inet6_dev;
 struct net_device;
 struct net_proto_family;
@@ -139,7 +138,6 @@ extern int                  igmp6_event_report(struct sk_buff *skb);
 #ifdef CONFIG_SYSCTL
 extern int                     ndisc_ifinfo_sysctl_change(struct ctl_table *ctl,
                                                           int write,
-                                                          struct file * filp,
                                                           void __user *buffer,
                                                           size_t *lenp,
                                                           loff_t *ppos);
@@ -155,9 +153,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);
 }