patch-2.1.89 linux/include/net/neighbour.h

Next file: linux/include/net/route.h
Previous file: linux/include/net/ipv6.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.88/linux/include/net/neighbour.h linux/include/net/neighbour.h
@@ -53,7 +53,13 @@
 struct neigh_parms
 {
 	struct neigh_parms *next;
+	int	(*neigh_setup)(struct neighbour *);
+	struct neigh_table *tbl;
+	int	entries;
+	void	*priv;
+
 	void	*sysctl_table;
+
 	int	base_reachable_time;
 	int	retrans_time;
 	int	gc_staletime;
@@ -173,7 +179,7 @@
 						u8 *lladdr, void *saddr,
 						struct device *dev);
 
-extern struct neigh_parms	*neigh_parms_alloc(struct neigh_table *tbl);
+extern struct neigh_parms	*neigh_parms_alloc(struct device *dev, struct neigh_table *tbl);
 extern void			neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms);
 extern unsigned long		neigh_rand_reach_time(unsigned long base);
 
@@ -189,8 +195,8 @@
 extern int neigh_delete(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg);
 extern void neigh_app_ns(struct neighbour *n);
 
-extern void 			*neigh_sysctl_register(struct device *dev, struct neigh_parms *p,
-						       int p_id, int pdev_id, char *p_name);
+extern int			neigh_sysctl_register(struct device *dev, struct neigh_parms *p,
+						      int p_id, int pdev_id, char *p_name);
 extern void			neigh_sysctl_unregister(struct neigh_parms *p);
 
 /*
@@ -249,12 +255,12 @@
 	return 0;
 }
 
-extern __inline__ int neigh_table_lock(struct neigh_table *tbl)
+extern __inline__ void neigh_table_lock(struct neigh_table *tbl)
 {
 	atomic_inc(&tbl->lock);
 }
 
-extern __inline__ int neigh_table_unlock(struct neigh_table *tbl)
+extern __inline__ void neigh_table_unlock(struct neigh_table *tbl)
 {
 	atomic_dec(&tbl->lock);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov